Merge pull request #2555 from gtech-mulearn/dev

Editable Ig pages and role assign when editing ig

Author: nanda-kshr

api/dashboard/ig/dash_ig_serializer.py

@@ -1,4 +1,5 @@
 from rest_framework import serializers
+import json
 
 from db.task import InterestGroup
 
@@ -17,6 +18,16 @@ class Meta:
         fields = [
             "id",
             "name",
+            "resource",
+            "about",
+            "prerequisites",
+            "career_opportunities",
+            "top_blogs",
+            "people_to_follow",
+            "leads",
+            "mentors",
+            "thinktank",
+            "office_hours",
             "icon",
             "code",
             "category",
@@ -30,9 +41,50 @@ class Meta:
     def get_members(self, obj):
         return obj.user_ig_link_ig.all().count()
 
+    def to_representation(self, instance):
+        """Convert JSON-serialized text fields back to Python objects for API output."""
+        data = super().to_representation(instance)
+        json_fields = [
+            "prerequisites",
+            "career_opportunities",
+            "top_blogs",
+            "people_to_follow",
+            "mentors",
+            "leads",
+        ]
+
+        for field in json_fields:
+            val = data.get(field)
+            if isinstance(val, str) and val:
+                try:
+                    parsed = json.loads(val)
+                    data[field] = parsed
+                except Exception:
+                    # leave as-is (plain string)
+                    pass
+
+        return data
+
 
 class InterestGroupCreateUpdateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = InterestGroup
-        fields = ["name", "code", "category", "icon", "created_by", "updated_by"]
+        fields = [
+            "name",
+            "code",
+            "category",
+            "icon",
+            "about",
+            "prerequisites",
+            "career_opportunities",
+            "resource",
+            "top_blogs",
+            "people_to_follow",
+            "leads",
+            "mentors",
+            "thinktank",
+            "office_hours",
+            "created_by",
+            "updated_by",
+        ]

api/dashboard/ig/dash_ig_view.py

@@ -11,6 +11,7 @@
     InterestGroupSerializer,
     InterestGroupCreateUpdateSerializer,
 )
+import json
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
 from api.dashboard.roles.dash_roles_serializer import RoleDashboardSerializer
@@ -59,6 +60,21 @@ def post(self, request):
 
         request_data = request.data
 
+        # serialize JSON-able fields to strings for DB storage
+        for fld in [
+            "prerequisites",
+            "career_opportunities",
+            "top_blogs",
+            "people_to_follow",
+            "leads",
+            "mentors",
+        ]:
+            if fld in request_data and not isinstance(request_data.get(fld), str):
+                try:
+                    request_data[fld] = json.dumps(request_data.get(fld))
+                except Exception:
+                    pass
+
         request_data["created_by"] = request_data["updated_by"] = user_id
 
         serializer = InterestGroupCreateUpdateSerializer(
@@ -142,6 +158,19 @@ def put(self, request, pk):
         ig_old_code = ig.code
 
         request_data = request.data
+        for fld in [
+            "prerequisites",
+            "career_opportunities",
+            "top_blogs",
+            "people_to_follow",
+            "leads",
+            "mentors",
+        ]:
+            if fld in request_data and not isinstance(request_data.get(fld), str):
+                try:
+                    request_data[fld] = json.dumps(request_data.get(fld))
+                except Exception:
+                    pass
         request_data["updated_by"] = user_id
 
         serializer = InterestGroupCreateUpdateSerializer(
@@ -243,7 +272,6 @@ def get(self, request):
 
 class InterestGroupGetAPI(APIView):
     authentication_classes = [CustomizePermission]
-
     @role_required([RoleType.ADMIN.value])
     def get(self, request, pk):
         ig_data = InterestGroup.objects.filter(id=pk).first()
@@ -259,6 +287,44 @@ def get(self, request, pk):
             response={"interestGroup": serializer.data}
         ).get_success_response()
 
+    @role_required([RoleType.ADMIN.value])
+    def patch(self, request, pk):
+        """Allow IG Lead or Admin to update IG editable fields."""
+        user_id = JWTUtils.fetch_user_id(request)
+        roles = JWTUtils.fetch_role(request)
+        ig = InterestGroup.objects.filter(id=pk).first()
+        if not ig:
+            return CustomResponse(general_message="Interest Group Does Not Exist").get_failure_response()
+
+        # Permission: Admins or IG Lead role for this IG code
+        ig_lead_role_title = RoleType.IG_LEAD_ROLE(ig.code)
+        if (RoleType.ADMIN.value not in roles) and (ig_lead_role_title not in roles):
+            return CustomResponse(general_message="You do not have permission to update this Interest Group").get_failure_response()
+
+        request_data = request.data
+        for fld in [
+            "prerequisites",
+            "career_opportunities",
+            "top_blogs",
+            "people_to_follow",
+            "leads",
+            "mentors",
+        ]:
+            if fld in request_data and not isinstance(request_data.get(fld), str):
+                try:
+                    request_data[fld] = json.dumps(request_data.get(fld))
+                except Exception:
+                    pass
+        request_data["updated_by"] = user_id
+
+        serializer = InterestGroupCreateUpdateSerializer(data=request_data, instance=ig, partial=True)
+
+        if serializer.is_valid():
+            serializer.save()
+            return CustomResponse(response={"interestGroup": serializer.data}).get_success_response()
+
+        return CustomResponse(message=serializer.errors).get_failure_response()
+
 
 class InterestGroupListApi(APIView):
     @method_decorator(cache_page(60 * 10))

api/dashboard/profile/profile_view.py

@@ -12,6 +12,8 @@
 from rest_framework.views import APIView
 from django.db.models import Sum
 from django.core.cache import cache
+from db.user import Role, UserRoleLink
+
 from django.utils.timezone import now
 
 from db.organization import UserOrganizationLink
@@ -103,6 +105,11 @@ def patch(self, request):
         user_id = JWTUtils.fetch_user_id(request)
         user = User.objects.get(id=user_id)
 
+        old_ig_links = list(user.user_ig_link_user.all())
+        old_ig_ids = set(link.ig_id for link in old_ig_links)
+        old_role_links = list(user.user_role_link_user.all())
+        old_role_ids = set(link.role_id for link in old_role_links)
+
         serializer = profile_serializer.UserIgEditSerializer(
             user, data=request.data, partial=True
         )
@@ -111,6 +118,36 @@ def patch(self, request):
             return CustomResponse(response=serializer.errors).get_failure_response()
 
         serializer.save()
+        new_ig_links = list(user.user_ig_link_user.all())
+        new_ig_ids = set(link.ig_id for link in new_ig_links)
+
+        old_ig_roles = set()
+        for ig_id in old_ig_ids:
+            ig = InterestGroup.objects.filter(id=ig_id).first()
+            if ig:
+                role = Role.objects.filter(title=ig.name).first()
+                if role:
+                    old_ig_roles.add(role.id)
+        UserRoleLink.objects.filter(user=user, role_id__in=old_ig_roles).delete()
+
+
+        new_ig_roles = set()
+        for ig_id in new_ig_ids:
+            ig = InterestGroup.objects.filter(id=ig_id).first()
+            if ig:
+                role = Role.objects.filter(title=ig.name).first()
+                if role:
+                    new_ig_roles.add(role.id)
+
+        for role_id in new_ig_roles:
+            if not UserRoleLink.objects.filter(user=user, role_id=role_id).exists():
+                UserRoleLink.objects.create(
+                    user=user,
+                    role_id=role_id,
+                    created_by=user,
+                    verified=True,
+                )
+
         DiscordWebhooks.general_updates(
             WebHookCategory.USER.value,
             WebHookActions.UPDATE.value,

db/task.py

@@ -41,6 +41,16 @@ class InterestGroup(models.Model):
     code = models.CharField(max_length=10, unique=True)
     icon = models.CharField(max_length=10)
     category =models.CharField(max_length=20,default="others",blank=False,null=False)
+    about = models.TextField(blank=True, null=True)
+    prerequisites = models.TextField(blank=True, null=True)
+    career_opportunities = models.TextField(blank=True, null=True)
+    top_blogs = models.TextField(blank=True, null=True)
+    people_to_follow = models.TextField(blank=True, null=True)
+    resource = models.TextField(blank=True, null=True)
+    leads = models.TextField(blank=True, null=True)
+    mentors = models.TextField(blank=True, null=True)
+    thinktank = models.TextField(blank=True, null=True)
+    office_hours = models.CharField(max_length=200, blank=True, null=True)
     updated_by = models.ForeignKey(User, on_delete=models.SET(settings.SYSTEM_ADMIN_ID), db_column="updated_by",
                                    related_name="interest_group_updated_by")
     updated_at = models.DateTimeField(auto_now=True)