From c6cf298a66156e270eb5ffa3c478171ae13d2b84 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 7 Nov 2022 18:12:33 +0100
Subject: [PATCH 01/26] change hr_group and primary_group to admin_group and
 member_group in models

---
 backend/apps/organizations/models.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/apps/organizations/models.py b/backend/apps/organizations/models.py
index d0f66d32a..a3ade904f 100644
--- a/backend/apps/organizations/models.py
+++ b/backend/apps/organizations/models.py
@@ -4,7 +4,7 @@
 from django.db import models
 from django.db.models import UniqueConstraint
 
-from apps.permissions.constants import HR_TYPE, PRIMARY_TYPE
+from apps.permissions.constants import ADMIN_GROUP_TYPE, MEMBER_GROUP_TYPE
 from apps.permissions.models import ResponsibleGroup
 
 
@@ -42,22 +42,22 @@ class Organization(models.Model):
     )
 
     @property
-    def hr_group(self) -> Optional["ResponsibleGroup"]:
+    def admin_group(self) -> Optional["ResponsibleGroup"]:
         try:
-            return self.permission_groups.get(group_type=HR_TYPE)
+            return self.permission_groups.get(group_type=ADMIN_GROUP_TYPE)
         except ResponsibleGroup.DoesNotExist:
             return None
 
     @property
-    def primary_group(self) -> Optional["ResponsibleGroup"]:
+    def member_group(self) -> Optional["ResponsibleGroup"]:
         try:
-            return self.permission_groups.get(group_type=PRIMARY_TYPE)
+            return self.permission_groups.get(group_type=MEMBER_GROUP_TYPE)
         except ResponsibleGroup.DoesNotExist:
             return None
 
     class Meta:
         constraints = [UniqueConstraint(fields=["parent", "name"], name="unique_child_organization_name")]
-        permissions = [("manage_organization", "Can manage organizations, used for admins")]
+        # permissions = [("manage_organization", "Can manage organizations, used for admins")]
 
     def __str__(self):
         return f"{self.name}"

From d800ba4c941abc466166ef84831822f57d366710 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 7 Nov 2022 18:13:03 +0100
Subject: [PATCH 02/26] update group constants

---
 backend/apps/permissions/constants.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/apps/permissions/constants.py b/backend/apps/permissions/constants.py
index 230f8a70c..77d632f61 100644
--- a/backend/apps/permissions/constants.py
+++ b/backend/apps/permissions/constants.py
@@ -3,14 +3,14 @@
 DefaultPermissionsType = Final[list[tuple[str, str]]]
 
 # Default ResponsibleGroup types
-PRIMARY_TYPE: Literal["PRIMARY"] = "PRIMARY"
-HR_TYPE: Literal["HR"] = "HR"
+MEMBER_GROUP_TYPE: Literal["MEMBER"] = "MEMBER"
+ADMIN_GROUP_TYPE: Literal["ADMIN"] = "ADMIN"
 
 ORGANIZATION: Final = "Organization member"
 INDOK: Final = "Indøk"
 REGISTERED_USER: Final = "Registered user"
-PRIMARY_GROUP_NAME: Final = "Medlem"
-HR_GROUP_NAME: Final = "HR"
+MEMBER_GROUP_NAME: Final = "Medlem"
+ADMIN_GROUP_NAME: Final = "Administrator"
 
 DEFAULT_ORGANIZATION_PERMISSIONS: DefaultPermissionsType = [
     ("events", "add_event"),

From 5faef2558956cbbe0808b3093282af292708d900 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 7 Nov 2022 18:13:32 +0100
Subject: [PATCH 03/26] change instances of hr_group and primary_group

---
 backend/apps/organizations/signals.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index d7dfb07a5..3dd14f99a 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -7,11 +7,11 @@
 
 from apps.organizations.models import Membership, Organization
 from apps.permissions.constants import (
-    HR_GROUP_NAME,
-    HR_TYPE,
+    ADMIN_GROUP_NAME,
+    ADMIN_GROUP_TYPE,
     ORGANIZATION,
-    PRIMARY_GROUP_NAME,
-    PRIMARY_TYPE,
+    MEMBER_GROUP_NAME,
+    MEMBER_GROUP_TYPE,
 )
 from apps.permissions.models import ResponsibleGroup
 
@@ -44,19 +44,20 @@ def handle_removed_member(instance: Membership, **kwargs):
 @receiver(post_save, sender=Organization)
 def create_default_groups(instance: Organization, created, **kwargs):
     """
-    Creates and assigns a primary group and HR group to members of the organization.
+    Creates and assigns a primary group and ADMIN group to members of the organization.
     """
     if created:
         ResponsibleGroup.objects.create(
-            name=PRIMARY_GROUP_NAME,
+            name=MEMBER_GROUP_NAME,
             description=f"Medlemmer av {instance.name}.",
             organization=instance,
-            group_type=PRIMARY_TYPE,
+            group_type=MEMBER_GROUP_TYPE,
         )
-        hr_group = ResponsibleGroup.objects.create(
-            name=HR_GROUP_NAME,
-            description=f"HR-gruppen til {instance.name}. Tillatelser for å se og behandle søknader.",
+        admin_group = ResponsibleGroup.objects.create(
+            name=ADMIN_GROUP_NAME,
+            description=f"ADMIN-gruppen til {instance.name}. Tillatelser for å se og behandle søknader.",
             organization=instance,
-            group_type=HR_TYPE,
+            group_type=ADMIN_GROUP_TYPE,
         )
-        assign_perm("forms.add_form", hr_group.group)
+        assign_perm("forms.add_form", admin_group.group)
+        assign_perm("organizations.manage_organization", admin_group.group)

From 1d6e42bf3fe1f649cad69929d3dfe4195499f5ed Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 7 Nov 2022 18:40:38 +0100
Subject: [PATCH 04/26] fix query error

---
 backend/apps/ecommerce/tests.py               |  2 +-
 backend/apps/forms/signals.py                 |  2 +-
 backend/apps/forms/tests.py                   |  2 +-
 .../migrations/0024_auto_20210422_2020.py     |  2 +-
 .../migrations/0025_auto_20210426_1735.py     |  8 ++---
 .../migrations/0026_auto_20210426_1802.py     | 20 ++++++------
 .../migrations/0028_auto_20210426_1948.py     |  6 ++--
 .../migrations/0029_auto_20210426_2129.py     |  4 +--
 .../migrations/0030_auto_20210426_2129.py     |  2 +-
 .../migrations/0031_auto_20210824_1446.py     |  6 ++--
 .../migrations/0032_auto_20210824_1457.py     |  4 +--
 backend/apps/organizations/signals.py         |  4 +--
 backend/apps/organizations/types.py           |  8 ++---
 .../migrations/0003_auto_20210824_1213.py     | 14 ++++----
 .../migrations/0005_auto_20210824_1446.py     | 32 ++++++++++---------
 backend/schema.json                           | 18 +++--------
 .../pages/organization/OrgMembers.tsx         |  4 +--
 frontend/src/generated/graphql.tsx            | 16 +++++-----
 frontend/src/graphql/orgs/fragments.graphql   |  4 +--
 19 files changed, 76 insertions(+), 82 deletions(-)

diff --git a/backend/apps/ecommerce/tests.py b/backend/apps/ecommerce/tests.py
index a161cad1b..8846542ca 100644
--- a/backend/apps/ecommerce/tests.py
+++ b/backend/apps/ecommerce/tests.py
@@ -112,7 +112,7 @@ def setUp(self) -> None:
         MembershipFactory(
             user=self.staff_user,
             organization=self.organization,
-            group=self.organization.primary_group,
+            group=self.organization.member_group,
         )
         self.total_quantity = 5
         self.max_buyable_quantity = 2
diff --git a/backend/apps/forms/signals.py b/backend/apps/forms/signals.py
index d94907b67..ffe107665 100644
--- a/backend/apps/forms/signals.py
+++ b/backend/apps/forms/signals.py
@@ -9,6 +9,6 @@
 def handle_new_form(sender, instance: Form, created: bool, **kwargs) -> None:
     if created:
         perms = ["forms.manage_form", "forms.change_form", "forms.delete_form"]
-        group = instance.organization.hr_group.group
+        group = instance.organization.admin_group.group
         for perm in perms:
             assign_perm(perm, group, instance)
diff --git a/backend/apps/forms/tests.py b/backend/apps/forms/tests.py
index b079384a2..8090061b7 100644
--- a/backend/apps/forms/tests.py
+++ b/backend/apps/forms/tests.py
@@ -31,7 +31,7 @@ def setUp(self) -> None:
         MembershipFactory(
             user=self.authorized_user,
             organization=self.organization,
-            group=self.organization.hr_group,
+            group=self.organization.admin_group,
         )
 
         # Create the form
diff --git a/backend/apps/organizations/migrations/0024_auto_20210422_2020.py b/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
index e7e688a03..2a57cdb09 100644
--- a/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
+++ b/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="organization",
-            name="primary_group",
+            name="member_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.CASCADE, to="permissions.responsiblegroup", null=True
             ),
diff --git a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
index 2562b82a2..e9021674e 100644
--- a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
+++ b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
@@ -3,16 +3,16 @@
 from django.db import migrations
 
 
-def set_primary_groups(apps, schema_editor):
+def set_member_groups(apps, schema_editor):
     Organization = apps.get_model("organizations", "Organization")
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
 
     for organization in Organization.objects.all():
-        if organization.primary_group is None:
+        if organization.member_group is None:
             rg = ResponsibleGroup.objects.create(
                 name=organization.name, description=f"Medlemmer av {organization.name}"
             )
-            organization.primary_group = rg
+            organization.member_group = rg
             organization.save()
 
 
@@ -22,4 +22,4 @@ class Migration(migrations.Migration):
         ("organizations", "0024_auto_20210422_2020"),
     ]
 
-    operations = [migrations.RunPython(set_primary_groups, lambda apps, schema_editor: None)]
+    operations = [migrations.RunPython(set_member_groups, lambda apps, schema_editor: None)]
diff --git a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
index 7fa684902..160d571e3 100644
--- a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
+++ b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
@@ -4,23 +4,23 @@
 import django.db.models.deletion
 
 
-def set_primary_groups(apps, schema_editor):
+def set_member_groups(apps, schema_editor):
     Organization = apps.get_model("organizations", "Organization")
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
 
     for organization in Organization.objects.all():
         created = False
-        if organization.primary_group is None:
-            primary_group = ResponsibleGroup.objects.create(
+        if organization.member_group is None:
+            member_group = ResponsibleGroup.objects.create(
                 name=organization.name, description=f"Medlemmer av {organization.name}"
             )
-            organization.primary_group = primary_group
+            organization.member_group = member_group
             created = True
-        if organization.hr_group is None:
-            hr_group = ResponsibleGroup.objects.create(
+        if organization.admin_group is None:
+            admin_group = ResponsibleGroup.objects.create(
                 name="HR", description=f"HR-gruppen til {organization.name}. Tillatelser for å se og behandle søknader."
             )
-            organization.hr_group = hr_group
+            organization.admin_group = admin_group
             created = True
 
         if created:
@@ -41,7 +41,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="organization",
-            name="hr_group",
+            name="admin_group",
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
@@ -51,12 +51,12 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterField(
             model_name="organization",
-            name="primary_group",
+            name="member_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="organization",
                 to="permissions.responsiblegroup",
             ),
         ),
-        migrations.RunPython(set_primary_groups, lambda apps, schema_editor: None),
+        migrations.RunPython(set_member_groups, lambda apps, schema_editor: None),
     ]
diff --git a/backend/apps/organizations/migrations/0028_auto_20210426_1948.py b/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
index b80ab6d96..46d82a781 100644
--- a/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
+++ b/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
@@ -3,11 +3,11 @@
 from django.db import migrations
 
 
-def add_existing_members_to_primary_group(apps, schema_editor):
+def add_existing_members_to_member_group(apps, schema_editor):
     Membership = apps.get_model("organizations", "Membership")
 
     for membership in Membership.objects.all():
-        group = membership.organization.primary_group.group
+        group = membership.organization.member_group.group
         user = membership.user
         user.groups.add(group)
 
@@ -18,4 +18,4 @@ class Migration(migrations.Migration):
         ("organizations", "0027_auto_20210426_1843"),
     ]
 
-    operations = [migrations.RunPython(add_existing_members_to_primary_group, lambda apps, schema_editor: None)]
+    operations = [migrations.RunPython(add_existing_members_to_member_group, lambda apps, schema_editor: None)]
diff --git a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
index fda4ea409..556502abc 100644
--- a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="hr_group",
+            name="admin_group",
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.DO_NOTHING,
@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterField(
             model_name="organization",
-            name="primary_group",
+            name="member_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.DO_NOTHING,
                 related_name="organization",
diff --git a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
index 5071b49c0..1f70fb462 100644
--- a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="hr_group",
+            name="admin_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.DO_NOTHING,
                 related_name="hr_organization",
diff --git a/backend/apps/organizations/migrations/0031_auto_20210824_1446.py b/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
index f7f3ffb2c..50e2a5158 100644
--- a/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
+++ b/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
@@ -14,18 +14,18 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="hr_group",
+            name="admin_group",
             field=models.OneToOneField(
                 blank=True,
                 null=True,
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="hr_organization",
+                related_name="admin_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
         migrations.AlterField(
             model_name="organization",
-            name="primary_group",
+            name="member_group",
             field=models.OneToOneField(
                 blank=True,
                 null=True,
diff --git a/backend/apps/organizations/migrations/0032_auto_20210824_1457.py b/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
index 7c76740af..36ac49eec 100644
--- a/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
+++ b/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
@@ -13,10 +13,10 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RemoveField(
             model_name="organization",
-            name="hr_group",
+            name="admin_group",
         ),
         migrations.RemoveField(
             model_name="organization",
-            name="primary_group",
+            name="member_group",
         ),
     ]
diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index 3dd14f99a..3c477e5dc 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -19,7 +19,7 @@
 @receiver(post_save, sender=Membership)
 def handle_new_member(instance: Membership, **kwargs):
     optional_group: Optional[ResponsibleGroup] = instance.group
-    group: Group = instance.organization.primary_group.group
+    group: Group = instance.organization.member_group.group
     org_group: Group = Group.objects.get(name=ORGANIZATION)
     user = instance.user
     user.groups.add(org_group)
@@ -31,7 +31,7 @@ def handle_new_member(instance: Membership, **kwargs):
 
 @receiver(pre_delete, sender=Membership)
 def handle_removed_member(instance: Membership, **kwargs):
-    group: Group = instance.organization.primary_group.group
+    group: Group = instance.organization.member_group.group
     org_group: Group = Group.objects.get(name=ORGANIZATION)
     user = instance.user
     if group:
diff --git a/backend/apps/organizations/types.py b/backend/apps/organizations/types.py
index 0afeb43cd..2c9f10b4e 100644
--- a/backend/apps/organizations/types.py
+++ b/backend/apps/organizations/types.py
@@ -14,8 +14,8 @@
 class OrganizationType(DjangoObjectType):
     absolute_slug = graphene.String()
     listings = graphene.List(NonNull(ListingType))
-    primary_group = graphene.Field(source="primary_group", type=ResponsibleGroupType)
-    hr_group = graphene.Field(source="hr_group", type=ResponsibleGroupType)
+    member_group = graphene.Field(source="member_group", type=ResponsibleGroupType)
+    admin_group = graphene.Field(source="admin_group", type=ResponsibleGroupType)
 
     class Meta:
         model = Organization
@@ -30,8 +30,8 @@ class Meta:
             "users",
             "events",
             "logo_url",
-            "primary_group",
-            "hr_group",
+            "member_group",
+            "admin_group",
         ]
 
     @staticmethod
diff --git a/backend/apps/permissions/migrations/0003_auto_20210824_1213.py b/backend/apps/permissions/migrations/0003_auto_20210824_1213.py
index ad55b6550..a0f6e5250 100644
--- a/backend/apps/permissions/migrations/0003_auto_20210824_1213.py
+++ b/backend/apps/permissions/migrations/0003_auto_20210824_1213.py
@@ -4,7 +4,7 @@
 
 from django.db import migrations
 from django.db.models.query_utils import Q
-from apps.permissions.constants import PRIMARY_GROUP_NAME, HR_GROUP_NAME
+from apps.permissions.constants import MEMBER_GROUP_NAME, ADMIN_GROUP_NAME
 
 if TYPE_CHECKING:
     from apps.organizations import models
@@ -19,14 +19,14 @@ def improve_group_legibility(apps, _):
         responsible_group: "ResponsibleGroup" = group.responsiblegroup
         try:
             organization: "models.Organization" = Organization.objects.get(
-                Q(primary_group=responsible_group) | Q(hr_group=responsible_group)
+                Q(member_group=responsible_group) | Q(admin_group=responsible_group)
             )
 
             responsible_group_name = responsible_group.name
-            if organization.primary_group == responsible_group:
-                responsible_group_name = PRIMARY_GROUP_NAME
-            elif organization.hr_group == responsible_group:
-                responsible_group_name = HR_GROUP_NAME
+            if organization.member_group == responsible_group:
+                responsible_group_name = MEMBER_GROUP_NAME
+            elif organization.admin_group == responsible_group:
+                responsible_group_name = ADMIN_GROUP_NAME
             if responsible_group.name != responsible_group_name:
                 responsible_group.name = responsible_group_name
                 responsible_group.save()
@@ -50,7 +50,7 @@ def reverse_legible_group_names(apps, _):
         responsible_group = group.responsiblegroup
         try:
             organization = responsible_group.organization
-            if organization.primary_group == responsible_group:
+            if organization.member_group == responsible_group:
                 responsible_group.name = organization.name
                 responsible_group.save()
         except Organization.DoesNotExist:
diff --git a/backend/apps/permissions/migrations/0005_auto_20210824_1446.py b/backend/apps/permissions/migrations/0005_auto_20210824_1446.py
index 1e93c7960..50d86b448 100644
--- a/backend/apps/permissions/migrations/0005_auto_20210824_1446.py
+++ b/backend/apps/permissions/migrations/0005_auto_20210824_1446.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Type
 from django.db import migrations
 
-from apps.permissions.constants import HR_TYPE, PRIMARY_TYPE
+from apps.permissions.constants import ADMIN_GROUP_TYPE, MEMBER_GROUP_TYPE
 
 if TYPE_CHECKING:
     from apps.organizations import models as org_models
@@ -15,22 +15,22 @@ def move_permission_groups_to_fk(apps, _):
     Organization: Type["org_models.Organization"] = apps.get_model("organizations", "Organization")
 
     for organization in Organization.objects.all():
-        primary_group = organization.primary_group
-        hr_group = organization.hr_group
+        member_group = organization.member_group
+        admin_group = organization.admin_group
 
-        if primary_group and hr_group:
-            primary_group.group_type = PRIMARY_TYPE
-            hr_group.group_type = HR_TYPE
+        if member_group and admin_group:
+            member_group.group_type = MEMBER_GROUP_TYPE
+            admin_group.group_type = ADMIN_GROUP_TYPE
 
             # Name as of this migration
-            primary_group.temp_organization = organization
-            hr_group.temp_organization = organization
+            member_group.temp_organization = organization
+            admin_group.temp_organization = organization
 
-            primary_group.save()
-            hr_group.save()
+            member_group.save()
+            admin_group.save()
 
-            organization.primary_group = None
-            organization.hr_group = None
+            organization.member_group = None
+            organization.admin_group = None
             organization.save()
 
     # Delete orphan responsible groups
@@ -43,10 +43,12 @@ def move_permission_groups_to_one_to_one_field(apps, _):
 
     organization: "org_models.Organization"
     for organization in Organization.objects.all():
-        organization.primary_group = ResponsibleGroup.objects.get(
-            temp_organization=organization, group_type=PRIMARY_TYPE
+        organization.member_group = ResponsibleGroup.objects.get(
+            temp_organization=organization, group_type=MEMBER_GROUP_TYPE
+        )
+        organization.admin_group = ResponsibleGroup.objects.get(
+            temp_organization=organization, group_type=ADMIN_GROUP_TYPE
         )
-        organization.hr_group = ResponsibleGroup.objects.get(temp_organization=organization, group_type=HR_TYPE)
         organization.save()
 
 
diff --git a/backend/schema.json b/backend/schema.json
index 7ca001511..0061db6fa 100644
--- a/backend/schema.json
+++ b/backend/schema.json
@@ -20,11 +20,7 @@
             }
           ],
           "description": "Directs the executor to include this field or fragment only when the `if` argument is true.",
-          "locations": [
-            "FIELD",
-            "FRAGMENT_SPREAD",
-            "INLINE_FRAGMENT"
-          ],
+          "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
           "name": "include"
         },
         {
@@ -45,11 +41,7 @@
             }
           ],
           "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
-          "locations": [
-            "FIELD",
-            "FRAGMENT_SPREAD",
-            "INLINE_FRAGMENT"
-          ],
+          "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
           "name": "skip"
         }
       ],
@@ -1581,7 +1573,7 @@
               "deprecationReason": null,
               "description": null,
               "isDeprecated": false,
-              "name": "primaryGroup",
+              "name": "memberGroup",
               "type": {
                 "kind": "OBJECT",
                 "name": "ResponsibleGroupType",
@@ -1593,7 +1585,7 @@
               "deprecationReason": null,
               "description": null,
               "isDeprecated": false,
-              "name": "hrGroup",
+              "name": "adminGroup",
               "type": {
                 "kind": "OBJECT",
                 "name": "ResponsibleGroupType",
@@ -10900,4 +10892,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 60bbbe27b..5b8bbdf6e 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -77,12 +77,12 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
                   {membership.user.firstName} {membership.user.lastName}
                 </TableCell>
                 <TableCell>
-                  {membership?.group?.uuid == organization.hrGroup?.uuid ? "Administrator" : "Medlem"}
+                  {membership?.group?.uuid == organization.adminGroup?.uuid ? "Administrator" : "Medlem"}
                 </TableCell>
                 <PermissionRequired permission="organizations.change_organization">
                   <TableCell>
                     <Button variant="contained" color="warning" startIcon={<AdminPanelSettings />} sx={{ mr: 1 }}>
-                      {membership?.group?.uuid == organization.hrGroup?.uuid ? "Demoter" : "Promoter"}
+                      {membership?.group?.uuid == organization.adminGroup?.uuid ? "Demoter" : "Promoter"}
                     </Button>
                     <Button variant="contained" color="error" startIcon={<Delete />}>
                       Fjern
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index b4102aacd..1024cbece 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -899,17 +899,17 @@ export type OrganizationInput = {
 export type OrganizationType = {
   __typename?: "OrganizationType";
   absoluteSlug?: Maybe<Scalars["String"]>;
+  adminGroup?: Maybe<ResponsibleGroupType>;
   children: Array<OrganizationType>;
   color?: Maybe<Scalars["String"]>;
   description: Scalars["String"];
   events: Array<EventType>;
-  hrGroup?: Maybe<ResponsibleGroupType>;
   id: Scalars["ID"];
   listings?: Maybe<Array<ListingType>>;
   logoUrl?: Maybe<Scalars["String"]>;
+  memberGroup?: Maybe<ResponsibleGroupType>;
   name: Scalars["String"];
   parent?: Maybe<OrganizationType>;
-  primaryGroup?: Maybe<ResponsibleGroupType>;
   slug: Scalars["String"];
   users: Array<UserType>;
 };
@@ -2970,8 +2970,8 @@ export type AdminOrganizationFragment = {
   __typename?: "OrganizationType";
   id: string;
   name: string;
-  hrGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
-  primaryGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+  adminGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+  memberGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
   events: Array<{
     __typename?: "EventType";
     id: string;
@@ -3015,8 +3015,8 @@ export type AdminOrganizationQuery = {
     __typename?: "OrganizationType";
     id: string;
     name: string;
-    hrGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
-    primaryGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+    adminGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+    memberGroup?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
     events: Array<{
       __typename?: "EventType";
       id: string;
@@ -4203,7 +4203,7 @@ export const AdminOrganizationFragmentDoc = {
           { kind: "Field", name: { kind: "Name", value: "name" } },
           {
             kind: "Field",
-            name: { kind: "Name", value: "hrGroup" },
+            name: { kind: "Name", value: "adminGroup" },
             selectionSet: {
               kind: "SelectionSet",
               selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
@@ -4211,7 +4211,7 @@ export const AdminOrganizationFragmentDoc = {
           },
           {
             kind: "Field",
-            name: { kind: "Name", value: "primaryGroup" },
+            name: { kind: "Name", value: "memberGroup" },
             selectionSet: {
               kind: "SelectionSet",
               selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
diff --git a/frontend/src/graphql/orgs/fragments.graphql b/frontend/src/graphql/orgs/fragments.graphql
index aa1d15ff6..2f6014f06 100644
--- a/frontend/src/graphql/orgs/fragments.graphql
+++ b/frontend/src/graphql/orgs/fragments.graphql
@@ -1,10 +1,10 @@
 fragment AdminOrganization on OrganizationType {
   id
   name
-  hrGroup {
+  adminGroup {
     uuid
   }
-  primaryGroup {
+  memberGroup {
     uuid
   }
   events {

From aa5c147299c019bf20ca434fc5ffb0f193efaa08 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 14 Nov 2022 19:26:02 +0100
Subject: [PATCH 05/26] write custom migration

---
 .../migrations/0026_auto_20210426_1802.py     |  5 ++--
 .../migrations/0029_auto_20210426_2129.py     |  2 +-
 .../migrations/0030_auto_20210426_2129.py     |  2 +-
 .../migrations/0034_auto_20221114_1854.py     | 26 +++++++++++++++++++
 backend/apps/organizations/models.py          |  3 ++-
 backend/apps/organizations/signals.py         |  2 +-
 6 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 backend/apps/organizations/migrations/0034_auto_20221114_1854.py

diff --git a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
index 160d571e3..804d86d8d 100644
--- a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
+++ b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
@@ -18,7 +18,8 @@ def set_member_groups(apps, schema_editor):
             created = True
         if organization.admin_group is None:
             admin_group = ResponsibleGroup.objects.create(
-                name="HR", description=f"HR-gruppen til {organization.name}. Tillatelser for å se og behandle søknader."
+                name="ADMIN",
+                description=f"ADMIN-gruppen til {organization.name}. Tillatelser for å se og behandle søknader.",
             )
             organization.admin_group = admin_group
             created = True
@@ -45,7 +46,7 @@ class Migration(migrations.Migration):
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
-                related_name="hr_organization",
+                related_name="admin_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
diff --git a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
index 556502abc..7bded9a99 100644
--- a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="hr_organization",
+                related_name="admin_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
diff --git a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
index 1f70fb462..d5fe6a643 100644
--- a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
             name="admin_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="hr_organization",
+                related_name="admin_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
diff --git a/backend/apps/organizations/migrations/0034_auto_20221114_1854.py b/backend/apps/organizations/migrations/0034_auto_20221114_1854.py
new file mode 100644
index 000000000..d3e364a48
--- /dev/null
+++ b/backend/apps/organizations/migrations/0034_auto_20221114_1854.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.16 on 2022-11-14 17:54
+
+from django.db import migrations
+from apps.permissions.constants import ADMIN_GROUP_NAME, ADMIN_GROUP_TYPE, MEMBER_GROUP_NAME, MEMBER_GROUP_TYPE
+
+
+def migrate_org_groups(apps, schema_editor):
+    ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
+    for group in ResponsibleGroup.objects.all():
+        if group.name == "HR":
+            group.name == ADMIN_GROUP_NAME
+            group.group_type == ADMIN_GROUP_TYPE
+            group.save()
+        if group.name == "Medlem":
+            group.name = MEMBER_GROUP_NAME
+            group.group_type = MEMBER_GROUP_TYPE
+            group.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("organizations", "0033_merge_0031_auto_20210909_1813_0032_auto_20210824_1457"),
+    ]
+
+    operations = [migrations.RunPython(migrate_org_groups)]
diff --git a/backend/apps/organizations/models.py b/backend/apps/organizations/models.py
index a3ade904f..b5181a647 100644
--- a/backend/apps/organizations/models.py
+++ b/backend/apps/organizations/models.py
@@ -28,7 +28,8 @@ class Organization(models.Model):
     # Permission groups
     # All members are added to the primary group
     # Members can be added to groups programatically
-    # The HR-group has the "forms.manage_form" permission, allowing them to view and manage responses to e.g. listings.
+    # The ADMIN-group has the "forms.manage_form" permission, allowing them to view and manage responses to e.g.
+    # listings.
     # The primary group is intended to act as a group for organizations who need any kind of
     # special permission, e.g. hyttestyret
     # Or if we wish to limit the creation of events or listings to certain organizations.
diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index 3c477e5dc..963908da1 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -55,7 +55,7 @@ def create_default_groups(instance: Organization, created, **kwargs):
         )
         admin_group = ResponsibleGroup.objects.create(
             name=ADMIN_GROUP_NAME,
-            description=f"ADMIN-gruppen til {instance.name}. Tillatelser for å se og behandle søknader.",
+            description=f"ADMIN-gruppen til {instance.name}. Tillatelser for å se og behandle søknader og medlemmer.",
             organization=instance,
             group_type=ADMIN_GROUP_TYPE,
         )

From ad934824ce64dd17d13599155dd7d156c115eebf Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 17 Nov 2022 18:15:07 +0100
Subject: [PATCH 06/26] revert changes to previous migrations

---
 .../migrations/0024_auto_20210422_2020.py     |  2 +-
 .../migrations/0025_auto_20210426_1735.py     |  4 +--
 .../migrations/0026_auto_20210426_1802.py     | 26 +++++++++----------
 .../migrations/0028_auto_20210426_1948.py     |  6 ++---
 .../migrations/0030_auto_20210426_2129.py     |  4 +--
 .../migrations/0031_auto_20210824_1446.py     |  6 ++---
 .../migrations/0032_auto_20210824_1457.py     |  4 +--
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/backend/apps/organizations/migrations/0024_auto_20210422_2020.py b/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
index 2a57cdb09..e7e688a03 100644
--- a/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
+++ b/backend/apps/organizations/migrations/0024_auto_20210422_2020.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="organization",
-            name="member_group",
+            name="primary_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.CASCADE, to="permissions.responsiblegroup", null=True
             ),
diff --git a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
index e9021674e..5ac629e53 100644
--- a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
+++ b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
@@ -8,11 +8,11 @@ def set_member_groups(apps, schema_editor):
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
 
     for organization in Organization.objects.all():
-        if organization.member_group is None:
+        if organization.primary_group is None:
             rg = ResponsibleGroup.objects.create(
                 name=organization.name, description=f"Medlemmer av {organization.name}"
             )
-            organization.member_group = rg
+            organization.primary_group = rg
             organization.save()
 
 
diff --git a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
index 804d86d8d..6e0af6ae4 100644
--- a/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
+++ b/backend/apps/organizations/migrations/0026_auto_20210426_1802.py
@@ -4,24 +4,24 @@
 import django.db.models.deletion
 
 
-def set_member_groups(apps, schema_editor):
+def set_primary_groups(apps, schema_editor):
     Organization = apps.get_model("organizations", "Organization")
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
 
     for organization in Organization.objects.all():
         created = False
-        if organization.member_group is None:
-            member_group = ResponsibleGroup.objects.create(
+        if organization.primary_group is None:
+            primary_group = ResponsibleGroup.objects.create(
                 name=organization.name, description=f"Medlemmer av {organization.name}"
             )
-            organization.member_group = member_group
+            organization.primary_group = primary_group
             created = True
-        if organization.admin_group is None:
-            admin_group = ResponsibleGroup.objects.create(
-                name="ADMIN",
-                description=f"ADMIN-gruppen til {organization.name}. Tillatelser for å se og behandle søknader.",
+        if organization.hr_group is None:
+            hr_group = ResponsibleGroup.objects.create(
+                name="HR",
+                description=f"HR-gruppen til {organization.name}. Tillatelser for å se og behandle søknader.",
             )
-            organization.admin_group = admin_group
+            organization.hr_group = hr_group
             created = True
 
         if created:
@@ -42,22 +42,22 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="organization",
-            name="admin_group",
+            name="hr_group",
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
-                related_name="admin_organization",
+                related_name="hr_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
         migrations.AlterField(
             model_name="organization",
-            name="member_group",
+            name="primary_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="organization",
                 to="permissions.responsiblegroup",
             ),
         ),
-        migrations.RunPython(set_member_groups, lambda apps, schema_editor: None),
+        migrations.RunPython(set_primary_groups, lambda apps, schema_editor: None),
     ]
diff --git a/backend/apps/organizations/migrations/0028_auto_20210426_1948.py b/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
index 46d82a781..b80ab6d96 100644
--- a/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
+++ b/backend/apps/organizations/migrations/0028_auto_20210426_1948.py
@@ -3,11 +3,11 @@
 from django.db import migrations
 
 
-def add_existing_members_to_member_group(apps, schema_editor):
+def add_existing_members_to_primary_group(apps, schema_editor):
     Membership = apps.get_model("organizations", "Membership")
 
     for membership in Membership.objects.all():
-        group = membership.organization.member_group.group
+        group = membership.organization.primary_group.group
         user = membership.user
         user.groups.add(group)
 
@@ -18,4 +18,4 @@ class Migration(migrations.Migration):
         ("organizations", "0027_auto_20210426_1843"),
     ]
 
-    operations = [migrations.RunPython(add_existing_members_to_member_group, lambda apps, schema_editor: None)]
+    operations = [migrations.RunPython(add_existing_members_to_primary_group, lambda apps, schema_editor: None)]
diff --git a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
index d5fe6a643..5071b49c0 100644
--- a/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0030_auto_20210426_2129.py
@@ -14,10 +14,10 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="admin_group",
+            name="hr_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="admin_organization",
+                related_name="hr_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
diff --git a/backend/apps/organizations/migrations/0031_auto_20210824_1446.py b/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
index 50e2a5158..f7f3ffb2c 100644
--- a/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
+++ b/backend/apps/organizations/migrations/0031_auto_20210824_1446.py
@@ -14,18 +14,18 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="admin_group",
+            name="hr_group",
             field=models.OneToOneField(
                 blank=True,
                 null=True,
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="admin_organization",
+                related_name="hr_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
         migrations.AlterField(
             model_name="organization",
-            name="member_group",
+            name="primary_group",
             field=models.OneToOneField(
                 blank=True,
                 null=True,
diff --git a/backend/apps/organizations/migrations/0032_auto_20210824_1457.py b/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
index 36ac49eec..7c76740af 100644
--- a/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
+++ b/backend/apps/organizations/migrations/0032_auto_20210824_1457.py
@@ -13,10 +13,10 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RemoveField(
             model_name="organization",
-            name="admin_group",
+            name="hr_group",
         ),
         migrations.RemoveField(
             model_name="organization",
-            name="member_group",
+            name="primary_group",
         ),
     ]

From 22a5b204c16339fff5029e48b66bb1d190d801b9 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 17 Nov 2022 18:16:22 +0100
Subject: [PATCH 07/26] revert changes to previous migrations

---
 .../apps/organizations/migrations/0025_auto_20210426_1735.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
index 5ac629e53..2562b82a2 100644
--- a/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
+++ b/backend/apps/organizations/migrations/0025_auto_20210426_1735.py
@@ -3,7 +3,7 @@
 from django.db import migrations
 
 
-def set_member_groups(apps, schema_editor):
+def set_primary_groups(apps, schema_editor):
     Organization = apps.get_model("organizations", "Organization")
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
 
@@ -22,4 +22,4 @@ class Migration(migrations.Migration):
         ("organizations", "0024_auto_20210422_2020"),
     ]
 
-    operations = [migrations.RunPython(set_member_groups, lambda apps, schema_editor: None)]
+    operations = [migrations.RunPython(set_primary_groups, lambda apps, schema_editor: None)]

From 1eef979c4278d2ac9b9bc981e15df328962684c1 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 17 Nov 2022 18:16:59 +0100
Subject: [PATCH 08/26] revert changes to previous migrations

---
 .../organizations/migrations/0029_auto_20210426_2129.py     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
index 7bded9a99..fda4ea409 100644
--- a/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
+++ b/backend/apps/organizations/migrations/0029_auto_20210426_2129.py
@@ -14,17 +14,17 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterField(
             model_name="organization",
-            name="admin_group",
+            name="hr_group",
             field=models.OneToOneField(
                 null=True,
                 on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="admin_organization",
+                related_name="hr_organization",
                 to="permissions.responsiblegroup",
             ),
         ),
         migrations.AlterField(
             model_name="organization",
-            name="member_group",
+            name="primary_group",
             field=models.OneToOneField(
                 on_delete=django.db.models.deletion.DO_NOTHING,
                 related_name="organization",

From de5d3d7cf71fb1d48af82e16b77953f39dc1afaa Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 17 Nov 2022 18:23:55 +0100
Subject: [PATCH 09/26] move custom migrations to more appropriate folder

---
 .../migrations/0034_auto_20221114_1854.py                         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/apps/{organizations => permissions}/migrations/0034_auto_20221114_1854.py (100%)

diff --git a/backend/apps/organizations/migrations/0034_auto_20221114_1854.py b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
similarity index 100%
rename from backend/apps/organizations/migrations/0034_auto_20221114_1854.py
rename to backend/apps/permissions/migrations/0034_auto_20221114_1854.py

From 3733a79691c37b621f5cebc8d0e0bbf42e5b58ae Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 17 Nov 2022 18:25:35 +0100
Subject: [PATCH 10/26] merge migrations due to conflicts

---
 .../migrations/0035_merge_20221117_1825.py          | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 backend/apps/permissions/migrations/0035_merge_20221117_1825.py

diff --git a/backend/apps/permissions/migrations/0035_merge_20221117_1825.py b/backend/apps/permissions/migrations/0035_merge_20221117_1825.py
new file mode 100644
index 000000000..e110603b3
--- /dev/null
+++ b/backend/apps/permissions/migrations/0035_merge_20221117_1825.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.16 on 2022-11-17 17:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("permissions", "0011_merge_0004_auto_20210824_2126_0010_auto_20210824_1546"),
+        ("permissions", "0034_auto_20221114_1854"),
+    ]
+
+    operations = []

From ccd26d8c21a5a1d3f929372d4881c9aa26a99252 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 21 Nov 2022 21:38:29 +0100
Subject: [PATCH 11/26] remove manage_organization permission from
 organizations/signals.py

---
 .../0034_alter_organization_options.py          | 17 +++++++++++++++++
 backend/apps/organizations/signals.py           |  1 -
 yarn.lock                                       |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 backend/apps/organizations/migrations/0034_alter_organization_options.py
 create mode 100644 yarn.lock

diff --git a/backend/apps/organizations/migrations/0034_alter_organization_options.py b/backend/apps/organizations/migrations/0034_alter_organization_options.py
new file mode 100644
index 000000000..ad8b57182
--- /dev/null
+++ b/backend/apps/organizations/migrations/0034_alter_organization_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.16 on 2022-11-21 20:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("organizations", "0033_merge_0031_auto_20210909_1813_0032_auto_20210824_1457"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="organization",
+            options={"permissions": [("manage_organization", "Can manage organizations, used for admins")]},
+        ),
+    ]
diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index 963908da1..e8b7a241f 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -60,4 +60,3 @@ def create_default_groups(instance: Organization, created, **kwargs):
             group_type=ADMIN_GROUP_TYPE,
         )
         assign_perm("forms.add_form", admin_group.group)
-        assign_perm("organizations.manage_organization", admin_group.group)
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..fb57ccd13
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

From bb000da0c7ae02db238ca87f604627d81e6bf64e Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 21 Nov 2022 21:40:50 +0100
Subject: [PATCH 12/26] uncomment manage_organization permission in
 organizations/models.py

---
 backend/apps/organizations/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/apps/organizations/models.py b/backend/apps/organizations/models.py
index b5181a647..3c4476091 100644
--- a/backend/apps/organizations/models.py
+++ b/backend/apps/organizations/models.py
@@ -58,7 +58,7 @@ def member_group(self) -> Optional["ResponsibleGroup"]:
 
     class Meta:
         constraints = [UniqueConstraint(fields=["parent", "name"], name="unique_child_organization_name")]
-        # permissions = [("manage_organization", "Can manage organizations, used for admins")]
+        permissions = [("manage_organization", "Can manage organizations, used for admins")]
 
     def __str__(self):
         return f"{self.name}"

From 008dfdb347d2633a2da1e605cf7fb775448cc005 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 21 Nov 2022 21:49:07 +0100
Subject: [PATCH 13/26] remove autogenerated yarn.lock file

---
 yarn.lock | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index fb57ccd13..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-

From 188b95fbbdde7367bf218889eecf8948de0bbc47 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 21 Nov 2022 22:40:49 +0100
Subject: [PATCH 14/26] quality of life improvement for admin-panel, more
 easily readable with explicit names for groups

---
 .../apps/permissions/migrations/0034_auto_20221114_1854.py    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
index d3e364a48..944ce55e7 100644
--- a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
+++ b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
@@ -8,11 +8,11 @@ def migrate_org_groups(apps, schema_editor):
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
     for group in ResponsibleGroup.objects.all():
         if group.name == "HR":
-            group.name == ADMIN_GROUP_NAME
+            group.name == f"{ADMIN_GROUP_NAME}:{group.organization.name}"
             group.group_type == ADMIN_GROUP_TYPE
             group.save()
         if group.name == "Medlem":
-            group.name = MEMBER_GROUP_NAME
+            group.name = f"{MEMBER_GROUP_NAME}:{group.organization.name}"
             group.group_type = MEMBER_GROUP_TYPE
             group.save()
 

From 2cde7d2c77ea7fa5e54d3c41520dd7efe623af76 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 21 Nov 2022 22:46:22 +0100
Subject: [PATCH 15/26] Admin-panel improvements and update signal and
 migration to be more descriptive

---
 backend/apps/organizations/signals.py                         | 4 ++--
 .../apps/permissions/migrations/0034_auto_20221114_1854.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index e8b7a241f..0d7ab50eb 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -48,13 +48,13 @@ def create_default_groups(instance: Organization, created, **kwargs):
     """
     if created:
         ResponsibleGroup.objects.create(
-            name=MEMBER_GROUP_NAME,
+            name=f"{instance.name}:{MEMBER_GROUP_NAME}",
             description=f"Medlemmer av {instance.name}.",
             organization=instance,
             group_type=MEMBER_GROUP_TYPE,
         )
         admin_group = ResponsibleGroup.objects.create(
-            name=ADMIN_GROUP_NAME,
+            name=f"{instance.name}:{ADMIN_GROUP_NAME}",
             description=f"ADMIN-gruppen til {instance.name}. Tillatelser for å se og behandle søknader og medlemmer.",
             organization=instance,
             group_type=ADMIN_GROUP_TYPE,
diff --git a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
index 944ce55e7..a35eaa84e 100644
--- a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
+++ b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
@@ -8,11 +8,11 @@ def migrate_org_groups(apps, schema_editor):
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
     for group in ResponsibleGroup.objects.all():
         if group.name == "HR":
-            group.name == f"{ADMIN_GROUP_NAME}:{group.organization.name}"
+            group.name == f"{group.organization.name}:{ADMIN_GROUP_NAME}"
             group.group_type == ADMIN_GROUP_TYPE
             group.save()
         if group.name == "Medlem":
-            group.name = f"{MEMBER_GROUP_NAME}:{group.organization.name}"
+            group.name = f"{group.organization.name}:{MEMBER_GROUP_NAME}"
             group.group_type = MEMBER_GROUP_TYPE
             group.save()
 

From 30d6ad4c0e5a7c95ca2ecc62e8ea05f784a5e4ae Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Tue, 22 Nov 2022 13:36:03 +0100
Subject: [PATCH 16/26] update migration

---
 .../migrations/0034_auto_20221114_1854.py     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
index a35eaa84e..982b0118c 100644
--- a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
+++ b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
@@ -1,20 +1,31 @@
 # Generated by Django 3.2.16 on 2022-11-14 17:54
 
 from django.db import migrations
-from apps.permissions.constants import ADMIN_GROUP_NAME, ADMIN_GROUP_TYPE, MEMBER_GROUP_NAME, MEMBER_GROUP_TYPE
+from apps.permissions.constants import ADMIN_GROUP_TYPE, MEMBER_GROUP_TYPE
 
 
 def migrate_org_groups(apps, schema_editor):
     ResponsibleGroup = apps.get_model("permissions", "ResponsibleGroup")
-    for group in ResponsibleGroup.objects.all():
-        if group.name == "HR":
-            group.name == f"{group.organization.name}:{ADMIN_GROUP_NAME}"
-            group.group_type == ADMIN_GROUP_TYPE
-            group.save()
-        if group.name == "Medlem":
-            group.name = f"{group.organization.name}:{MEMBER_GROUP_NAME}"
-            group.group_type = MEMBER_GROUP_TYPE
-            group.save()
+    for responsible_group in ResponsibleGroup.objects.all():
+        if responsible_group.name == "HR":
+            # ResponsibleGroup names format is "Organization:Type" (e.g. "Organization:ADMIN")
+            # Type is either "ADMIN" or "MEMBER"
+            # ResponsibleGroup has a group field which is a django.contrib.auth.models.Group with outdated names
+            # Change the Type in group name to "ADMIN" or "MEMBER" depending on the ResponsibleGroup name (e.g. "Organization:HR:uuid" -> "Organization:ADMIN:uuid")
+            # Change ResponsibleGroup.group_type from "HR" or "PRIMARY" to "ADMIN" or "MEMBER"
+            responsible_group.name = f"{responsible_group.organization.name}:{ADMIN_GROUP_TYPE}"
+            responsible_group.group.name = (
+                f"{responsible_group.organization.name}:{ADMIN_GROUP_TYPE}:{responsible_group.group.uuid}"
+            )
+            responsible_group.group_type = ADMIN_GROUP_TYPE
+            responsible_group.save()
+        if responsible_group.name == "Medlem":
+            responsible_group.name = f"{responsible_group.organization.name}:{MEMBER_GROUP_TYPE}"
+            responsible_group.group.name = (
+                f"{responsible_group.organization.name}:{MEMBER_GROUP_TYPE}:{responsible_group.group.uuid}"
+            )
+            responsible_group.group_type = MEMBER_GROUP_TYPE
+            responsible_group.save()
 
 
 class Migration(migrations.Migration):

From fe300380eaeee064d44fc080f0d7d6ccecb4abf9 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Tue, 22 Nov 2022 19:16:14 +0100
Subject: [PATCH 17/26] fix naming error

---
 backend/apps/organizations/signals.py | 2 ++
 backend/apps/permissions/signals.py   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/apps/organizations/signals.py b/backend/apps/organizations/signals.py
index 0d7ab50eb..6f7b546ff 100644
--- a/backend/apps/organizations/signals.py
+++ b/backend/apps/organizations/signals.py
@@ -59,4 +59,6 @@ def create_default_groups(instance: Organization, created, **kwargs):
             organization=instance,
             group_type=ADMIN_GROUP_TYPE,
         )
+        print(admin_group.group, instance)
         assign_perm("forms.add_form", admin_group.group)
+        # assign_perm("organizations.manage_organization", admin_group.group, instance)
diff --git a/backend/apps/permissions/signals.py b/backend/apps/permissions/signals.py
index fa2ae43fd..cc63f27fc 100644
--- a/backend/apps/permissions/signals.py
+++ b/backend/apps/permissions/signals.py
@@ -24,8 +24,7 @@ def create_named_group(sender, instance: ResponsibleGroup, **kwargs):
     try:
         instance.group
     except ObjectDoesNotExist:
-        prefix: str = instance.organization.name
-        group = Group.objects.create(name=f"{prefix}:{instance.name}:{uuid4().hex}")
+        group = Group.objects.create(name=f"{instance.name}:{uuid4().hex}")
         instance.group = group
 
 

From 6556ecf58cee63d15da6b48b51efcdc3d5fcdf2f Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Tue, 22 Nov 2022 19:20:51 +0100
Subject: [PATCH 18/26] fix typing error

---
 backend/apps/permissions/migrations/0034_auto_20221114_1854.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
index 982b0118c..3bd94ac85 100644
--- a/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
+++ b/backend/apps/permissions/migrations/0034_auto_20221114_1854.py
@@ -15,7 +15,7 @@ def migrate_org_groups(apps, schema_editor):
             # Change ResponsibleGroup.group_type from "HR" or "PRIMARY" to "ADMIN" or "MEMBER"
             responsible_group.name = f"{responsible_group.organization.name}:{ADMIN_GROUP_TYPE}"
             responsible_group.group.name = (
-                f"{responsible_group.organization.name}:{ADMIN_GROUP_TYPE}:{responsible_group.group.uuid}"
+                f"{responsible_group.organization.name}:{ADMIN_GROUP_TYPE}:git{responsible_group.group.uuid}"
             )
             responsible_group.group_type = ADMIN_GROUP_TYPE
             responsible_group.save()

From 1dcf3d83e8c45e6103d0d92bea8bf6fd4fec0a88 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 12 Jan 2023 19:12:40 +0100
Subject: [PATCH 19/26] commit before merge

---
 .../pages/organization/OrgMembers.tsx         | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 60bbbe27b..7c53875c0 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -17,7 +17,7 @@ import {
 import { useState } from "react";
 
 import { PermissionRequired } from "@/components/Auth";
-import { AdminOrganizationFragment, MembershipsDocument } from "@/generated/graphql";
+import { AdminOrganizationFragment, MembershipsDocument, MembershipType } from "@/generated/graphql";
 
 type Props = {
   organization: AdminOrganizationFragment;
@@ -34,11 +34,25 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
   //Sorterer medlemmer alfabetisk
   [...data?.memberships].sort((a, b) => a.user.firstName.localeCompare(b.user.firstName));
 
-  const addUser = () => {
+  const handleAddMembership = () => {
     //Legg til funksjonalitet for å legge til bruker ved brukernavn
     setUserInput(""); //Funker men oppdaterer ikke siden?
   };
 
+  const handleGroupChange = (membership: MembershipType | any) => {
+    if (!membership) return;
+    const role = membership?.group?.uuid == organization.hrGroup?.uuid ? "ADMIN" : "MEMBER";
+    if (role == "ADMIN") console.log("Demoterer" + membership.user.firstName + " " + membership.user.lastName);
+    if (role == "MEMBER") console.log("Promoterer" + membership.user.firstName + " " + membership.user.lastName);
+    //Legg til funksjonalitet for å endre gruppe
+  };
+
+  const handleRemoveMembership = (membership: MembershipType | any) => {
+    if (!membership) return;
+    console.log("Fjerner " + membership.user.firstName + " " + membership.user.lastName);
+    //Legg til funksjonalitet for å fjerne medlem
+  };
+
   return (
     <Stack spacing={4}>
       <Typography variant="h3">Oversikt over medlemmer</Typography>
@@ -53,7 +67,7 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
             />
           </Grid>
           <Grid item xs={6} md={4} lg={2}>
-            <Button startIcon={<GroupAdd />} onClick={() => addUser()}>
+            <Button startIcon={<GroupAdd />} onClick={() => handleAddMembership()}>
               Legg til
             </Button>
           </Grid>
@@ -81,10 +95,21 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
                 </TableCell>
                 <PermissionRequired permission="organizations.change_organization">
                   <TableCell>
-                    <Button variant="contained" color="warning" startIcon={<AdminPanelSettings />} sx={{ mr: 1 }}>
+                    <Button
+                      onClick={handleGroupChange(membership)}
+                      variant="contained"
+                      color="warning"
+                      startIcon={<AdminPanelSettings />}
+                      sx={{ mr: 1 }}
+                    >
                       {membership?.group?.uuid == organization.hrGroup?.uuid ? "Demoter" : "Promoter"}
                     </Button>
-                    <Button variant="contained" color="error" startIcon={<Delete />}>
+                    <Button
+                      onClick={handleRemoveMembership(membership)}
+                      variant="contained"
+                      color="error"
+                      startIcon={<Delete />}
+                    >
                       Fjern
                     </Button>
                   </TableCell>

From aacf92bc55a78855f3ab4c4375f0f80ece1e1ad7 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 12 Jan 2023 19:59:36 +0100
Subject: [PATCH 20/26] start on mutations

---
 backend/apps/organizations/mutations.py       |  4 +-
 .../pages/organization/OrgMembers.tsx         | 46 ++++++++--
 frontend/src/generated/graphql.tsx            | 83 +++++++++++++++++++
 frontend/src/graphql/orgs/mutations.graphql   | 14 ++++
 4 files changed, 140 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/graphql/orgs/mutations.graphql

diff --git a/backend/apps/organizations/mutations.py b/backend/apps/organizations/mutations.py
index 9b056f676..2b9ba5b83 100644
--- a/backend/apps/organizations/mutations.py
+++ b/backend/apps/organizations/mutations.py
@@ -47,7 +47,7 @@ class Arguments:
         id = graphene.ID(required=True)
         organization_data = OrganizationInput(required=False)
 
-    @permission_required("organizations.manage_organization")
+    @permission_required("organizations.change_organization")
     def mutate(self, info, id, organization_data=None):
         organization = Organization.objects.get(pk=id)
         user = info.context.user
@@ -91,7 +91,7 @@ class AssignMembership(graphene.Mutation):
     class Arguments:
         membership_data = MembershipInput(required=True)
 
-    @permission_required("organizations.manage_organization", fn=get_organization_from_data)
+    @permission_required("organizations.change_organization", fn=get_organization_from_data)
     def mutate(self, _, membership_data):
         organization = Organization.objects.prefetch_related("permission_groups").get(
             pk=membership_data["organization_id"]
diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 0adc4ced6..6e031012d 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client";
 import { Delete, GroupAdd, AdminPanelSettings } from "@mui/icons-material";
 import {
   Button,
@@ -17,7 +17,12 @@ import {
 import { useState } from "react";
 
 import { PermissionRequired } from "@/components/Auth";
-import { AdminOrganizationFragment, MembershipsDocument, MembershipType } from "@/generated/graphql";
+import {
+  AdminOrganizationFragment,
+  MembershipsDocument,
+  MembershipType,
+  AssignMembershipDocument,
+} from "@/generated/graphql";
 
 type Props = {
   organization: AdminOrganizationFragment;
@@ -25,6 +30,10 @@ type Props = {
 
 export const OrgMembers: React.FC<Props> = ({ organization }) => {
   const { data, loading, error } = useQuery(MembershipsDocument, { variables: { organizationId: organization.id } });
+  const [
+    AssignMembership,
+    { data: AssignMembershipData, loading: AssignMembershipLoading, error: AssignMembershipError },
+  ] = useMutation(AssignMembershipDocument);
 
   const [userInput, setUserInput] = useState<string>("");
 
@@ -36,14 +45,41 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
 
   const handleAddMembership = () => {
     //Legg til funksjonalitet for å legge til bruker ved brukernavn
-    setUserInput(""); //Funker men oppdaterer ikke siden?
+    console.log("Legger til " + userInput);
+    setUserInput("");
   };
 
   const handleGroupChange = (membership: MembershipType | any) => {
     if (!membership) return;
     const role = membership?.group?.uuid == organization.adminGroup?.uuid ? "ADMIN" : "MEMBER";
-    if (role == "ADMIN") console.log("Demoterer" + membership.user.firstName + " " + membership.user.lastName);
-    if (role == "MEMBER") console.log("Promoterer" + membership.user.firstName + " " + membership.user.lastName);
+    if (role == "ADMIN") console.log("Demoterer " + membership.user.firstName + " " + membership.user.lastName);
+    if (role == "MEMBER") console.log("Promoterer " + membership.user.firstName + " " + membership.user.lastName);
+
+    if (role == "ADMIN") {
+      //Legg til funksjonalitet for å demote bruker
+      AssignMembership({
+        variables: {
+          membershipData: {
+            organizationId: organization.id,
+            userId: membership.user.id,
+            groupId: organization?.memberGroup?.uuid,
+          },
+        },
+      });
+    }
+
+    if (role == "MEMBER") {
+      //Legg til funksjonalitet for å promote bruker
+      AssignMembership({
+        variables: {
+          membershipData: {
+            organizationId: organization.id,
+            userId: membership.user.id,
+            groupId: organization?.adminGroup?.uuid,
+          },
+        },
+      });
+    }
     //Legg til funksjonalitet for å endre gruppe
   };
 
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index 1024cbece..166781721 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -3005,6 +3005,24 @@ export type MembershipFragment = {
   group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
 };
 
+export type AssignMembershipMutationVariables = Exact<{
+  membershipData: MembershipInput;
+}>;
+
+export type AssignMembershipMutation = {
+  __typename?: "Mutations";
+  assignMembership?: {
+    __typename?: "AssignMembership";
+    ok?: boolean | null;
+    membership?: {
+      __typename?: "MembershipType";
+      id: string;
+      organization: { __typename?: "OrganizationType"; id: string };
+      group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+    } | null;
+  } | null;
+};
+
 export type AdminOrganizationQueryVariables = Exact<{
   orgId: Scalars["ID"];
 }>;
@@ -6639,6 +6657,71 @@ export const UserOrganizationsDocument = {
     ...ListingOrganizationFragmentDoc.definitions,
   ],
 } as unknown as DocumentNode<UserOrganizationsQuery, UserOrganizationsQueryVariables>;
+export const AssignMembershipDocument = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "mutation",
+      name: { kind: "Name", value: "assignMembership" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "MembershipInput" } } },
+        },
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "assignMembership" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "membershipData" },
+                value: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+              },
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "membership" },
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      { kind: "Field", name: { kind: "Name", value: "id" } },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "organization" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }],
+                        },
+                      },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "group" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
+                        },
+                      },
+                    ],
+                  },
+                },
+                { kind: "Field", name: { kind: "Name", value: "ok" } },
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<AssignMembershipMutation, AssignMembershipMutationVariables>;
 export const AdminOrganizationDocument = {
   kind: "Document",
   definitions: [
diff --git a/frontend/src/graphql/orgs/mutations.graphql b/frontend/src/graphql/orgs/mutations.graphql
new file mode 100644
index 000000000..ff0237a0a
--- /dev/null
+++ b/frontend/src/graphql/orgs/mutations.graphql
@@ -0,0 +1,14 @@
+mutation assignMembership($membershipData: MembershipInput!) {
+  assignMembership(membershipData: $membershipData) {
+    membership {
+      id
+      organization {
+        id
+      }
+      group {
+        uuid
+      }
+    }
+    ok
+  }
+}

From 1415d843abd13f0be884fd1e5848cf84f4fae393 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 30 Jan 2023 18:27:41 +0100
Subject: [PATCH 21/26] add removeMembership mutation

---
 backend/apps/organizations/mutations.py | 14 +++++++++-----
 backend/apps/organizations/schema.py    |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/apps/organizations/mutations.py b/backend/apps/organizations/mutations.py
index 2b9ba5b83..c809cba74 100644
--- a/backend/apps/organizations/mutations.py
+++ b/backend/apps/organizations/mutations.py
@@ -2,7 +2,6 @@
 from django.utils.text import slugify
 from decorators import permission_required
 
-from apps.users.types import UserType
 from apps.permissions.models import ResponsibleGroup
 
 from apps.organizations import permissions as perms
@@ -112,11 +111,16 @@ def mutate(self, _, membership_data):
 
 
 class RemoveMembership(graphene.Mutation):
-    removed_member = graphene.Field(UserType)
+    membership = graphene.Field(MembershipType)
     ok = graphene.Boolean()
 
     class Arguments:
-        member_id = graphene.ID()
+        id = graphene.ID()
+
+    @permission_required("organizations.manage_organization")
+    def mutate(self, info, id):
+        membership = Membership.objects.get(pk=id)
+        membership.delete()
 
-    def mutate(self, info, member_id):
-        raise NotImplementedError("Denne funksjonaliteten er ikke implementert.")
+        ok = True
+        return RemoveMembership(ok=ok)
diff --git a/backend/apps/organizations/schema.py b/backend/apps/organizations/schema.py
index 590470737..676e085a1 100644
--- a/backend/apps/organizations/schema.py
+++ b/backend/apps/organizations/schema.py
@@ -3,6 +3,7 @@
 
 from .mutations import (
     AssignMembership,
+    RemoveMembership,
     CreateOrganization,
     DeleteOrganization,
     UpdateOrganization,
@@ -17,6 +18,7 @@ class OrganizationMutations(graphene.ObjectType):
     delete_organization = DeleteOrganization.Field()
 
     assign_membership = AssignMembership.Field()
+    remove_membership = RemoveMembership.Field()
 
 
 class OrganizationQueries(graphene.ObjectType, OrganizationResolvers, MembershipResolvers):

From 6238bd4f2036d24e1c9f871294aa341d8c39924d Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 30 Jan 2023 18:44:43 +0100
Subject: [PATCH 22/26] fix unused desctructured variables

---
 .../src/components/pages/organization/OrgMembers.tsx  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 6e031012d..542334662 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -32,7 +32,7 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
   const { data, loading, error } = useQuery(MembershipsDocument, { variables: { organizationId: organization.id } });
   const [
     AssignMembership,
-    { data: AssignMembershipData, loading: AssignMembershipLoading, error: AssignMembershipError },
+    { data: assignMembershipData, loading: assignMembershipLoading, error: assignMembershipError },
   ] = useMutation(AssignMembershipDocument);
 
   const [userInput, setUserInput] = useState<string>("");
@@ -65,6 +65,9 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
             groupId: organization?.memberGroup?.uuid,
           },
         },
+      }).then(() => {
+        console.log("Demoterer " + membership.user.firstName + " " + membership.user.lastName);
+        console.log(assignMembershipData);
       });
     }
 
@@ -78,8 +81,14 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
             groupId: organization?.adminGroup?.uuid,
           },
         },
+      }).then(() => {
+        console.log("Promoterer " + membership.user.firstName + " " + membership.user.lastName);
+        console.log(assignMembershipData);
       });
     }
+
+    if (assignMembershipError) return <p>Error</p>;
+    if (assignMembershipLoading) return <CircularProgress />;
     //Legg til funksjonalitet for å endre gruppe
   };
 

From 2b4317801bb327426aefa7eab1b7190abb6511fd Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 30 Jan 2023 19:12:28 +0100
Subject: [PATCH 23/26] fix graphql schema

---
 .../pages/organization/OrgMembers.tsx         | 25 ++++----
 frontend/src/generated/graphql.tsx            | 59 +++++++++++++++++++
 frontend/src/graphql/orgs/mutations.graphql   |  6 ++
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 542334662..587f58889 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -22,6 +22,7 @@ import {
   MembershipsDocument,
   MembershipType,
   AssignMembershipDocument,
+  DeleteMembershipDocument,
 } from "@/generated/graphql";
 
 type Props = {
@@ -30,10 +31,8 @@ type Props = {
 
 export const OrgMembers: React.FC<Props> = ({ organization }) => {
   const { data, loading, error } = useQuery(MembershipsDocument, { variables: { organizationId: organization.id } });
-  const [
-    AssignMembership,
-    { data: assignMembershipData, loading: assignMembershipLoading, error: assignMembershipError },
-  ] = useMutation(AssignMembershipDocument);
+  const [AssignMembership] = useMutation(AssignMembershipDocument);
+  const [DeleteMembership] = useMutation(DeleteMembershipDocument);
 
   const [userInput, setUserInput] = useState<string>("");
 
@@ -65,9 +64,6 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
             groupId: organization?.memberGroup?.uuid,
           },
         },
-      }).then(() => {
-        console.log("Demoterer " + membership.user.firstName + " " + membership.user.lastName);
-        console.log(assignMembershipData);
       });
     }
 
@@ -81,21 +77,20 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
             groupId: organization?.adminGroup?.uuid,
           },
         },
-      }).then(() => {
-        console.log("Promoterer " + membership.user.firstName + " " + membership.user.lastName);
-        console.log(assignMembershipData);
       });
     }
-
-    if (assignMembershipError) return <p>Error</p>;
-    if (assignMembershipLoading) return <CircularProgress />;
-    //Legg til funksjonalitet for å endre gruppe
   };
 
   const handleRemoveMembership = (membership: MembershipType | any) => {
     if (!membership) return;
+
+    DeleteMembership({
+      variables: {
+        membershipId: membership.id,
+      },
+    });
+
     console.log("Fjerner " + membership.user.firstName + " " + membership.user.lastName);
-    //Legg til funksjonalitet for å fjerne medlem
   };
 
   return (
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index 166781721..3b38c4232 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -98,6 +98,8 @@ export enum ArchiveDocumentTypeDoc {
   ForeningensLover = "FORENINGENS_LOVER",
   /** Generalforsamling */
   Generalforsamling = "GENERALFORSAMLING",
+  /** Januscript */
+  Januscript = "JANUSCRIPT",
   /** Støtte fra HS */
   StotteFraHs = "STOTTE_FRA_HS",
   /** Utveksling */
@@ -405,6 +407,12 @@ export type DeleteListing = {
   ok?: Maybe<Scalars["Boolean"]>;
 };
 
+export type DeleteMembership = {
+  __typename?: "DeleteMembership";
+  membership?: Maybe<MembershipType>;
+  ok?: Maybe<Scalars["Boolean"]>;
+};
+
 export type DeleteOrganization = {
   __typename?: "DeleteOrganization";
   ok?: Maybe<Scalars["Boolean"]>;
@@ -600,6 +608,7 @@ export type Mutations = {
   deleteForm?: Maybe<DeleteForm>;
   /** Deletes the listing with the given ID */
   deleteListing?: Maybe<DeleteListing>;
+  deleteMembership?: Maybe<DeleteMembership>;
   deleteOrganization?: Maybe<DeleteOrganization>;
   deleteQuestion?: Maybe<DeleteQuestion>;
   /**
@@ -758,6 +767,10 @@ export type MutationsDeleteListingArgs = {
   id?: InputMaybe<Scalars["ID"]>;
 };
 
+export type MutationsDeleteMembershipArgs = {
+  membershipId?: InputMaybe<Scalars["ID"]>;
+};
+
 export type MutationsDeleteOrganizationArgs = {
   id: Scalars["ID"];
 };
@@ -3023,6 +3036,15 @@ export type AssignMembershipMutation = {
   } | null;
 };
 
+export type DeleteMembershipMutationVariables = Exact<{
+  membershipId: Scalars["ID"];
+}>;
+
+export type DeleteMembershipMutation = {
+  __typename?: "Mutations";
+  deleteMembership?: { __typename?: "DeleteMembership"; ok?: boolean | null } | null;
+};
+
 export type AdminOrganizationQueryVariables = Exact<{
   orgId: Scalars["ID"];
 }>;
@@ -6722,6 +6744,43 @@ export const AssignMembershipDocument = {
     },
   ],
 } as unknown as DocumentNode<AssignMembershipMutation, AssignMembershipMutationVariables>;
+export const DeleteMembershipDocument = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "mutation",
+      name: { kind: "Name", value: "deleteMembership" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "membershipId" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "ID" } } },
+        },
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "deleteMembership" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "membershipId" },
+                value: { kind: "Variable", name: { kind: "Name", value: "membershipId" } },
+              },
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [{ kind: "Field", name: { kind: "Name", value: "ok" } }],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<DeleteMembershipMutation, DeleteMembershipMutationVariables>;
 export const AdminOrganizationDocument = {
   kind: "Document",
   definitions: [
diff --git a/frontend/src/graphql/orgs/mutations.graphql b/frontend/src/graphql/orgs/mutations.graphql
index ff0237a0a..adda4ead8 100644
--- a/frontend/src/graphql/orgs/mutations.graphql
+++ b/frontend/src/graphql/orgs/mutations.graphql
@@ -12,3 +12,9 @@ mutation assignMembership($membershipData: MembershipInput!) {
     ok
   }
 }
+
+mutation deleteMembership($membershipId: ID!) {
+  deleteMembership(membershipId: $membershipId) {
+    ok
+  }
+}

From ca93d1a50c59fd4f06ebfe16d0118cc76c9ff82d Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Mon, 30 Jan 2023 20:09:42 +0100
Subject: [PATCH 24/26] Change role and delete membership fixed

---
 backend/apps/organizations/mutations.py |  34 ++++-
 backend/apps/organizations/schema.py    |   6 +-
 backend/schema.json                     | 171 +++++++++++++++++++++++-
 frontend/src/generated/graphql.tsx      | 122 +++++++++++++----
 4 files changed, 298 insertions(+), 35 deletions(-)

diff --git a/backend/apps/organizations/mutations.py b/backend/apps/organizations/mutations.py
index c809cba74..bcfed3915 100644
--- a/backend/apps/organizations/mutations.py
+++ b/backend/apps/organizations/mutations.py
@@ -90,7 +90,7 @@ class AssignMembership(graphene.Mutation):
     class Arguments:
         membership_data = MembershipInput(required=True)
 
-    @permission_required("organizations.change_organization", fn=get_organization_from_data)
+    @permission_required("organizations.manage_organization", fn=get_organization_from_data)
     def mutate(self, _, membership_data):
         organization = Organization.objects.prefetch_related("permission_groups").get(
             pk=membership_data["organization_id"]
@@ -110,17 +110,39 @@ def mutate(self, _, membership_data):
         return AssignMembership(membership=membership, ok=True)
 
 
-class RemoveMembership(graphene.Mutation):
+class DeleteMembership(graphene.Mutation):
     membership = graphene.Field(MembershipType)
     ok = graphene.Boolean()
 
     class Arguments:
-        id = graphene.ID()
+        membership_id = graphene.ID()
 
     @permission_required("organizations.manage_organization")
-    def mutate(self, info, id):
-        membership = Membership.objects.get(pk=id)
+    def mutate(self, info, membership_id):
+        membership = Membership.objects.get(pk=membership_id)
         membership.delete()
 
         ok = True
-        return RemoveMembership(ok=ok)
+        return DeleteMembership(ok=ok)
+
+
+class ChangeMembershipInput(graphene.InputObjectType):
+    membership_id = graphene.ID()
+    group_id = graphene.ID()
+
+
+class ChangeMembership(graphene.Mutation):
+    membership = graphene.Field(MembershipType)
+    ok = graphene.Boolean()
+
+    class Arguments:
+        membership_data = ChangeMembershipInput(required=True)
+
+    @permission_required("organizations.manage_organization")
+    def mutate(self, info, membership_data):
+        membership = Membership.objects.get(pk=membership_data["membership_id"])
+        membership.group_id = membership_data["group_id"]
+        membership.save()
+
+        ok = True
+        return ChangeMembership(membership=membership, ok=ok)
diff --git a/backend/apps/organizations/schema.py b/backend/apps/organizations/schema.py
index 676e085a1..011b371cf 100644
--- a/backend/apps/organizations/schema.py
+++ b/backend/apps/organizations/schema.py
@@ -3,10 +3,11 @@
 
 from .mutations import (
     AssignMembership,
-    RemoveMembership,
+    DeleteMembership,
     CreateOrganization,
     DeleteOrganization,
     UpdateOrganization,
+    ChangeMembership,
 )
 from .resolvers import MembershipResolvers, OrganizationResolvers
 from .types import MembershipType, OrganizationType
@@ -18,7 +19,8 @@ class OrganizationMutations(graphene.ObjectType):
     delete_organization = DeleteOrganization.Field()
 
     assign_membership = AssignMembership.Field()
-    remove_membership = RemoveMembership.Field()
+    delete_membership = DeleteMembership.Field()
+    change_membership = ChangeMembership.Field()
 
 
 class OrganizationQueries(graphene.ObjectType, OrganizationResolvers, MembershipResolvers):
diff --git a/backend/schema.json b/backend/schema.json
index 0061db6fa..8d69998b9 100644
--- a/backend/schema.json
+++ b/backend/schema.json
@@ -20,7 +20,11 @@
             }
           ],
           "description": "Directs the executor to include this field or fragment only when the `if` argument is true.",
-          "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+          "locations": [
+            "FIELD",
+            "FRAGMENT_SPREAD",
+            "INLINE_FRAGMENT"
+          ],
           "name": "include"
         },
         {
@@ -41,7 +45,11 @@
             }
           ],
           "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
-          "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+          "locations": [
+            "FIELD",
+            "FRAGMENT_SPREAD",
+            "INLINE_FRAGMENT"
+          ],
           "name": "skip"
         }
       ],
@@ -5001,6 +5009,12 @@
               "description": "Annet",
               "isDeprecated": false,
               "name": "ANNET"
+            },
+            {
+              "deprecationReason": null,
+              "description": "Januscript",
+              "isDeprecated": false,
+              "name": "JANUSCRIPT"
             }
           ],
           "fields": null,
@@ -5854,6 +5868,56 @@
                 "ofType": null
               }
             },
+            {
+              "args": [
+                {
+                  "defaultValue": null,
+                  "description": null,
+                  "name": "membershipId",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                }
+              ],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "deleteMembership",
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeleteMembership",
+                "ofType": null
+              }
+            },
+            {
+              "args": [
+                {
+                  "defaultValue": null,
+                  "description": null,
+                  "name": "membershipData",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ChangeMembershipInput",
+                      "ofType": null
+                    }
+                  }
+                }
+              ],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "changeMembership",
+              "type": {
+                "kind": "OBJECT",
+                "name": "ChangeMembership",
+                "ofType": null
+              }
+            },
             {
               "args": [
                 {
@@ -8275,6 +8339,107 @@
           "name": "MembershipInput",
           "possibleTypes": null
         },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": [
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "membership",
+              "type": {
+                "kind": "OBJECT",
+                "name": "MembershipType",
+                "ofType": null
+              }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "ok",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "kind": "OBJECT",
+          "name": "DeleteMembership",
+          "possibleTypes": null
+        },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": [
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "membership",
+              "type": {
+                "kind": "OBJECT",
+                "name": "MembershipType",
+                "ofType": null
+              }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "ok",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "kind": "OBJECT",
+          "name": "ChangeMembership",
+          "possibleTypes": null
+        },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "defaultValue": null,
+              "description": null,
+              "name": "membershipId",
+              "type": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            {
+              "defaultValue": null,
+              "description": null,
+              "name": "groupId",
+              "type": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            }
+          ],
+          "interfaces": null,
+          "kind": "INPUT_OBJECT",
+          "name": "ChangeMembershipInput",
+          "possibleTypes": null
+        },
         {
           "description": "Add a new booking to the database",
           "enumValues": null,
@@ -10892,4 +11057,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index 3b38c4232..9bd86538e 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -212,6 +212,17 @@ export type CategoryType = {
   name: Scalars["String"];
 };
 
+export type ChangeMembership = {
+  __typename?: "ChangeMembership";
+  membership?: Maybe<MembershipType>;
+  ok?: Maybe<Scalars["Boolean"]>;
+};
+
+export type ChangeMembershipInput = {
+  groupId?: InputMaybe<Scalars["ID"]>;
+  membershipId?: InputMaybe<Scalars["ID"]>;
+};
+
 export type CreateArchiveDocument = {
   __typename?: "CreateArchiveDocument";
   arhiveDocument?: Maybe<ArchiveDocumentType>;
@@ -578,6 +589,7 @@ export type Mutations = {
   assignMembership?: Maybe<AssignMembership>;
   attemptCapturePayment?: Maybe<AttemptCapturePayment>;
   authUser: AuthUser;
+  changeMembership?: Maybe<ChangeMembership>;
   createArchivedocument?: Maybe<CreateArchiveDocument>;
   createBlog?: Maybe<CreateBlog>;
   createBlogPost?: Maybe<CreateBlogPost>;
@@ -667,6 +679,10 @@ export type MutationsAuthUserArgs = {
   code: Scalars["String"];
 };
 
+export type MutationsChangeMembershipArgs = {
+  membershipData: ChangeMembershipInput;
+};
+
 export type MutationsCreateArchivedocumentArgs = {
   date?: InputMaybe<Scalars["DateTime"]>;
   fileLocation?: InputMaybe<Scalars["String"]>;
@@ -3014,7 +3030,7 @@ export type OrgAdminListingFragment = { __typename?: "ListingType"; id: string;
 export type MembershipFragment = {
   __typename?: "MembershipType";
   id: string;
-  user: { __typename?: "UserType"; firstName: string; lastName: string };
+  user: { __typename?: "UserType"; id: string; firstName: string; lastName: string };
   group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
 };
 
@@ -3045,6 +3061,23 @@ export type DeleteMembershipMutation = {
   deleteMembership?: { __typename?: "DeleteMembership"; ok?: boolean | null } | null;
 };
 
+export type ChangeMembershipMutationVariables = Exact<{
+  membershipData: ChangeMembershipInput;
+}>;
+
+export type ChangeMembershipMutation = {
+  __typename?: "Mutations";
+  changeMembership?: {
+    __typename?: "ChangeMembership";
+    ok?: boolean | null;
+    membership?: {
+      __typename?: "MembershipType";
+      id: string;
+      group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+    } | null;
+  } | null;
+};
+
 export type AdminOrganizationQueryVariables = Exact<{
   orgId: Scalars["ID"];
 }>;
@@ -3080,7 +3113,7 @@ export type MembershipsQuery = {
   memberships?: Array<{
     __typename?: "MembershipType";
     id: string;
-    user: { __typename?: "UserType"; firstName: string; lastName: string };
+    user: { __typename?: "UserType"; id: string; firstName: string; lastName: string };
     group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
   }> | null;
 };
@@ -4297,6 +4330,7 @@ export const MembershipFragmentDoc = {
             selectionSet: {
               kind: "SelectionSet",
               selections: [
+                { kind: "Field", name: { kind: "Name", value: "id" } },
                 { kind: "Field", name: { kind: "Name", value: "firstName" } },
                 { kind: "Field", name: { kind: "Name", value: "lastName" } },
               ],
@@ -6781,6 +6815,66 @@ export const DeleteMembershipDocument = {
     },
   ],
 } as unknown as DocumentNode<DeleteMembershipMutation, DeleteMembershipMutationVariables>;
+export const ChangeMembershipDocument = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "mutation",
+      name: { kind: "Name", value: "changeMembership" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+          type: {
+            kind: "NonNullType",
+            type: { kind: "NamedType", name: { kind: "Name", value: "ChangeMembershipInput" } },
+          },
+        },
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "changeMembership" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "membershipData" },
+                value: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+              },
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "membership" },
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      { kind: "Field", name: { kind: "Name", value: "id" } },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "group" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
+                        },
+                      },
+                    ],
+                  },
+                },
+                { kind: "Field", name: { kind: "Name", value: "ok" } },
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<ChangeMembershipMutation, ChangeMembershipMutationVariables>;
 export const AdminOrganizationDocument = {
   kind: "Document",
   definitions: [
@@ -6848,33 +6942,13 @@ export const MembershipsDocument = {
             ],
             selectionSet: {
               kind: "SelectionSet",
-              selections: [
-                { kind: "Field", name: { kind: "Name", value: "id" } },
-                {
-                  kind: "Field",
-                  name: { kind: "Name", value: "user" },
-                  selectionSet: {
-                    kind: "SelectionSet",
-                    selections: [
-                      { kind: "Field", name: { kind: "Name", value: "firstName" } },
-                      { kind: "Field", name: { kind: "Name", value: "lastName" } },
-                    ],
-                  },
-                },
-                {
-                  kind: "Field",
-                  name: { kind: "Name", value: "group" },
-                  selectionSet: {
-                    kind: "SelectionSet",
-                    selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
-                  },
-                },
-              ],
+              selections: [{ kind: "FragmentSpread", name: { kind: "Name", value: "Membership" } }],
             },
           },
         ],
       },
     },
+    ...MembershipFragmentDoc.definitions,
   ],
 } as unknown as DocumentNode<MembershipsQuery, MembershipsQueryVariables>;
 export const HasPermissionDocument = {

From 1e2b663a39c809e4929386533d9bbd482a28a3e6 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 2 Feb 2023 16:47:37 +0100
Subject: [PATCH 25/26] add membership_with_username mutation

---
 backend/apps/organizations/mutations.py       |  39 +++++++
 backend/apps/organizations/schema.py          |   2 +
 backend/schema.json                           | 103 ++++++++++++++++++
 .../pages/organization/OrgMembers.tsx         |  47 +++++---
 frontend/src/generated/graphql.tsx            | 103 ++++++++++++++++++
 frontend/src/graphql/orgs/fragments.graphql   |   1 +
 frontend/src/graphql/orgs/mutations.graphql   |  27 +++++
 frontend/src/graphql/orgs/queries.graphql     |   9 +-
 8 files changed, 307 insertions(+), 24 deletions(-)

diff --git a/backend/apps/organizations/mutations.py b/backend/apps/organizations/mutations.py
index bcfed3915..f8df8287e 100644
--- a/backend/apps/organizations/mutations.py
+++ b/backend/apps/organizations/mutations.py
@@ -7,6 +7,7 @@
 from apps.organizations import permissions as perms
 from apps.organizations.models import Membership, Organization
 from apps.organizations.types import MembershipType, OrganizationType
+from apps.users.models import User
 
 
 def get_organization_from_data(*_, membership_data, **kwargs) -> Organization:
@@ -110,6 +111,44 @@ def mutate(self, _, membership_data):
         return AssignMembership(membership=membership, ok=True)
 
 
+class MembershipInputWithUsername(graphene.InputObjectType):
+    username = graphene.String()
+    organization_id = graphene.ID()
+    group_id = graphene.ID()
+
+
+class AssignMembershipWithUsername(graphene.Mutation):
+    membership = graphene.Field(MembershipType)
+    ok = graphene.Boolean()
+
+    class Arguments:
+        membership_data = MembershipInputWithUsername(required=True)
+
+    @permission_required("organizations.manage_organization", fn=get_organization_from_data)
+    def mutate(self, _, membership_data):
+        organization = Organization.objects.prefetch_related("permission_groups").get(
+            pk=membership_data["organization_id"]
+        )
+
+        try:
+            group = organization.permission_groups.get(pk=membership_data.get("group_id"))
+        except ResponsibleGroup.DoesNotExist:
+            return AssignMembershipWithUsername(membership=None, ok=False)
+
+        try:
+            user_id = User.objects.get(username=membership_data["username"]).id
+        except User.DoesNotExist:
+            return AssignMembershipWithUsername(membership=None, ok=False)
+
+        membership = Membership(
+            organization_id=membership_data["organization_id"],
+            user_id=user_id,
+            group=group,
+        )
+        membership.save()
+        return AssignMembershipWithUsername(membership=membership, ok=True)
+
+
 class DeleteMembership(graphene.Mutation):
     membership = graphene.Field(MembershipType)
     ok = graphene.Boolean()
diff --git a/backend/apps/organizations/schema.py b/backend/apps/organizations/schema.py
index 011b371cf..353e18da7 100644
--- a/backend/apps/organizations/schema.py
+++ b/backend/apps/organizations/schema.py
@@ -3,6 +3,7 @@
 
 from .mutations import (
     AssignMembership,
+    AssignMembershipWithUsername,
     DeleteMembership,
     CreateOrganization,
     DeleteOrganization,
@@ -21,6 +22,7 @@ class OrganizationMutations(graphene.ObjectType):
     assign_membership = AssignMembership.Field()
     delete_membership = DeleteMembership.Field()
     change_membership = ChangeMembership.Field()
+    assign_membership_with_username = AssignMembershipWithUsername.Field()
 
 
 class OrganizationQueries(graphene.ObjectType, OrganizationResolvers, MembershipResolvers):
diff --git a/backend/schema.json b/backend/schema.json
index 8d69998b9..c5f232db9 100644
--- a/backend/schema.json
+++ b/backend/schema.json
@@ -5918,6 +5918,33 @@
                 "ofType": null
               }
             },
+            {
+              "args": [
+                {
+                  "defaultValue": null,
+                  "description": null,
+                  "name": "membershipData",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "MembershipInputWithUsername",
+                      "ofType": null
+                    }
+                  }
+                }
+              ],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "assignMembershipWithUsername",
+              "type": {
+                "kind": "OBJECT",
+                "name": "AssignMembershipWithUsername",
+                "ofType": null
+              }
+            },
             {
               "args": [
                 {
@@ -8440,6 +8467,82 @@
           "name": "ChangeMembershipInput",
           "possibleTypes": null
         },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": [
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "membership",
+              "type": {
+                "kind": "OBJECT",
+                "name": "MembershipType",
+                "ofType": null
+              }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "ok",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "kind": "OBJECT",
+          "name": "AssignMembershipWithUsername",
+          "possibleTypes": null
+        },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "defaultValue": null,
+              "description": null,
+              "name": "username",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            {
+              "defaultValue": null,
+              "description": null,
+              "name": "organizationId",
+              "type": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            {
+              "defaultValue": null,
+              "description": null,
+              "name": "groupId",
+              "type": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            }
+          ],
+          "interfaces": null,
+          "kind": "INPUT_OBJECT",
+          "name": "MembershipInputWithUsername",
+          "possibleTypes": null
+        },
         {
           "description": "Add a new booking to the database",
           "enumValues": null,
diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index 587f58889..c34002fec 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -21,8 +21,9 @@ import {
   AdminOrganizationFragment,
   MembershipsDocument,
   MembershipType,
-  AssignMembershipDocument,
+  AssignMembershipWithUsernameDocument,
   DeleteMembershipDocument,
+  ChangeMembershipDocument,
 } from "@/generated/graphql";
 
 type Props = {
@@ -31,8 +32,9 @@ type Props = {
 
 export const OrgMembers: React.FC<Props> = ({ organization }) => {
   const { data, loading, error } = useQuery(MembershipsDocument, { variables: { organizationId: organization.id } });
-  const [AssignMembership] = useMutation(AssignMembershipDocument);
+  const [AssignMembershipWithUsername] = useMutation(AssignMembershipWithUsernameDocument);
   const [DeleteMembership] = useMutation(DeleteMembershipDocument);
+  const [ChangeMembership] = useMutation(ChangeMembershipDocument);
 
   const [userInput, setUserInput] = useState<string>("");
 
@@ -44,36 +46,49 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
 
   const handleAddMembership = () => {
     //Legg til funksjonalitet for å legge til bruker ved brukernavn
-    console.log("Legger til " + userInput);
+
+    //Get userId from username
+
+    AssignMembershipWithUsername({
+      variables: {
+        membershipData: {
+          organizationId: organization.id,
+          username: userInput.toLowerCase(), //Just to make sure
+          groupId: organization?.memberGroup?.uuid,
+        },
+      },
+    }).then((res) => {
+      console.log("Membership added");
+      console.log(res);
+      //Problem: Clientside cache doesnt get updated
+    });
     setUserInput("");
   };
 
   const handleGroupChange = (membership: MembershipType | any) => {
     if (!membership) return;
-    const role = membership?.group?.uuid == organization.adminGroup?.uuid ? "ADMIN" : "MEMBER";
-    if (role == "ADMIN") console.log("Demoterer " + membership.user.firstName + " " + membership.user.lastName);
-    if (role == "MEMBER") console.log("Promoterer " + membership.user.firstName + " " + membership.user.lastName);
 
-    if (role == "ADMIN") {
-      //Legg til funksjonalitet for å demote bruker
-      AssignMembership({
+    const currentRole = membership?.group?.uuid == organization.adminGroup?.uuid ? "ADMIN" : "MEMBER";
+    if (currentRole == "ADMIN") {
+      //Legg til funksjonalitet for å demotere bruker
+
+      ChangeMembership({
         variables: {
           membershipData: {
-            organizationId: organization.id,
-            userId: membership.user.id,
+            membershipId: membership?.id,
             groupId: organization?.memberGroup?.uuid,
           },
         },
       });
     }
 
-    if (role == "MEMBER") {
+    if (currentRole == "MEMBER") {
       //Legg til funksjonalitet for å promote bruker
-      AssignMembership({
+
+      ChangeMembership({
         variables: {
           membershipData: {
-            organizationId: organization.id,
-            userId: membership.user.id,
+            membershipId: membership?.id,
             groupId: organization?.adminGroup?.uuid,
           },
         },
@@ -90,7 +105,7 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
       },
     });
 
-    console.log("Fjerner " + membership.user.firstName + " " + membership.user.lastName);
+    //Problem: Clientside cache doesnt get updated
   };
 
   return (
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index 9bd86538e..e23ad7a79 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -112,6 +112,12 @@ export type AssignMembership = {
   ok?: Maybe<Scalars["Boolean"]>;
 };
 
+export type AssignMembershipWithUsername = {
+  __typename?: "AssignMembershipWithUsername";
+  membership?: Maybe<MembershipType>;
+  ok?: Maybe<Scalars["Boolean"]>;
+};
+
 export type AttemptCapturePayment = {
   __typename?: "AttemptCapturePayment";
   order?: Maybe<OrderType>;
@@ -569,6 +575,12 @@ export type MembershipInput = {
   userId?: InputMaybe<Scalars["ID"]>;
 };
 
+export type MembershipInputWithUsername = {
+  groupId?: InputMaybe<Scalars["ID"]>;
+  organizationId?: InputMaybe<Scalars["ID"]>;
+  username?: InputMaybe<Scalars["String"]>;
+};
+
 export type MembershipType = {
   __typename?: "MembershipType";
   group?: Maybe<ResponsibleGroupType>;
@@ -587,6 +599,7 @@ export type Mutations = {
    */
   adminEventSignOff?: Maybe<AdminEventSignOff>;
   assignMembership?: Maybe<AssignMembership>;
+  assignMembershipWithUsername?: Maybe<AssignMembershipWithUsername>;
   attemptCapturePayment?: Maybe<AttemptCapturePayment>;
   authUser: AuthUser;
   changeMembership?: Maybe<ChangeMembership>;
@@ -671,6 +684,10 @@ export type MutationsAssignMembershipArgs = {
   membershipData: MembershipInput;
 };
 
+export type MutationsAssignMembershipWithUsernameArgs = {
+  membershipData: MembershipInputWithUsername;
+};
+
 export type MutationsAttemptCapturePaymentArgs = {
   orderId: Scalars["ID"];
 };
@@ -3052,6 +3069,24 @@ export type AssignMembershipMutation = {
   } | null;
 };
 
+export type AssignMembershipWithUsernameMutationVariables = Exact<{
+  membershipData: MembershipInputWithUsername;
+}>;
+
+export type AssignMembershipWithUsernameMutation = {
+  __typename?: "Mutations";
+  assignMembershipWithUsername?: {
+    __typename?: "AssignMembershipWithUsername";
+    ok?: boolean | null;
+    membership?: {
+      __typename?: "MembershipType";
+      id: string;
+      organization: { __typename?: "OrganizationType"; id: string };
+      group?: { __typename?: "ResponsibleGroupType"; uuid: string } | null;
+    } | null;
+  } | null;
+};
+
 export type DeleteMembershipMutationVariables = Exact<{
   membershipId: Scalars["ID"];
 }>;
@@ -6778,6 +6813,74 @@ export const AssignMembershipDocument = {
     },
   ],
 } as unknown as DocumentNode<AssignMembershipMutation, AssignMembershipMutationVariables>;
+export const AssignMembershipWithUsernameDocument = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "mutation",
+      name: { kind: "Name", value: "assignMembershipWithUsername" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+          type: {
+            kind: "NonNullType",
+            type: { kind: "NamedType", name: { kind: "Name", value: "MembershipInputWithUsername" } },
+          },
+        },
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "assignMembershipWithUsername" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "membershipData" },
+                value: { kind: "Variable", name: { kind: "Name", value: "membershipData" } },
+              },
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "membership" },
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      { kind: "Field", name: { kind: "Name", value: "id" } },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "organization" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [{ kind: "Field", name: { kind: "Name", value: "id" } }],
+                        },
+                      },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "group" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [{ kind: "Field", name: { kind: "Name", value: "uuid" } }],
+                        },
+                      },
+                    ],
+                  },
+                },
+                { kind: "Field", name: { kind: "Name", value: "ok" } },
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<AssignMembershipWithUsernameMutation, AssignMembershipWithUsernameMutationVariables>;
 export const DeleteMembershipDocument = {
   kind: "Document",
   definitions: [
diff --git a/frontend/src/graphql/orgs/fragments.graphql b/frontend/src/graphql/orgs/fragments.graphql
index 2f6014f06..1b7d47ee2 100644
--- a/frontend/src/graphql/orgs/fragments.graphql
+++ b/frontend/src/graphql/orgs/fragments.graphql
@@ -36,6 +36,7 @@ fragment OrgAdminListing on ListingType {
 fragment Membership on MembershipType {
   id
   user {
+    id
     firstName
     lastName
   }
diff --git a/frontend/src/graphql/orgs/mutations.graphql b/frontend/src/graphql/orgs/mutations.graphql
index adda4ead8..4f508f5a1 100644
--- a/frontend/src/graphql/orgs/mutations.graphql
+++ b/frontend/src/graphql/orgs/mutations.graphql
@@ -13,8 +13,35 @@ mutation assignMembership($membershipData: MembershipInput!) {
   }
 }
 
+mutation assignMembershipWithUsername($membershipData: MembershipInputWithUsername!) {
+  assignMembershipWithUsername(membershipData: $membershipData) {
+    membership {
+      id
+      organization {
+        id
+      }
+      group {
+        uuid
+      }
+    }
+    ok
+  }
+}
+
 mutation deleteMembership($membershipId: ID!) {
   deleteMembership(membershipId: $membershipId) {
     ok
   }
 }
+
+mutation changeMembership($membershipData: ChangeMembershipInput!) {
+  changeMembership(membershipData: $membershipData) {
+    membership {
+      id
+      group {
+        uuid
+      }
+    }
+    ok
+  }
+}
diff --git a/frontend/src/graphql/orgs/queries.graphql b/frontend/src/graphql/orgs/queries.graphql
index 269a060ba..2db7169a8 100644
--- a/frontend/src/graphql/orgs/queries.graphql
+++ b/frontend/src/graphql/orgs/queries.graphql
@@ -6,13 +6,6 @@ query adminOrganization($orgId: ID!) {
 
 query memberships($organizationId: ID!) {
   memberships(organizationId: $organizationId) {
-    id
-    user {
-      firstName
-      lastName
-    }
-    group {
-      uuid
-    }
+    ...Membership
   }
 }

From 8a1678148961cfd500b1b1fd4ef8969949a7ca33 Mon Sep 17 00:00:00 2001
From: Simen Sandhaug <simen.sandhaug@gmail.com>
Date: Thu, 2 Feb 2023 18:06:11 +0100
Subject: [PATCH 26/26] add comments

---
 frontend/src/components/pages/organization/OrgMembers.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/components/pages/organization/OrgMembers.tsx b/frontend/src/components/pages/organization/OrgMembers.tsx
index c34002fec..93c963bfd 100644
--- a/frontend/src/components/pages/organization/OrgMembers.tsx
+++ b/frontend/src/components/pages/organization/OrgMembers.tsx
@@ -47,8 +47,6 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
   const handleAddMembership = () => {
     //Legg til funksjonalitet for å legge til bruker ved brukernavn
 
-    //Get userId from username
-
     AssignMembershipWithUsername({
       variables: {
         membershipData: {
@@ -57,11 +55,8 @@ export const OrgMembers: React.FC<Props> = ({ organization }) => {
           groupId: organization?.memberGroup?.uuid,
         },
       },
-    }).then((res) => {
-      console.log("Membership added");
-      console.log(res);
-      //Problem: Clientside cache doesnt get updated
     });
+    //Problem: Clientside cache doesnt get updated
     setUserInput("");
   };