Molnixtag groups into serializers and Admin page

Author: szabozoltan69

api/management/commands/sync_molnix.py

@@ -59,11 +59,9 @@ def add_tags(molnix_tags, api):
                 molnix_id=g['id'],
                 name=g['name'])
             if created:
-                # Bad ide to put these rows into get_or_create, because it would multiply records unnecessary.
-                # The below 3 rows are optional (just keeps these date parallel with Molnix).
                 tag_group.created_at = g['created_at']
-                tag_group.updated_at = g['updated_at']
-                tag_group.save()
+            tag_group.updated_at = g['updated_at']
+            tag_group.save()
             tag.groups.add(tag_group)
         tag.molnix_id = molnix_tag['id']
         tag.name = n = molnix_tag['name']

deployments/admin.py

@@ -46,6 +46,13 @@ class SectorTagAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('title',)
 
 
+class MolnixTagGroupAdmin(CompareVersionAdmin, admin.ModelAdmin):
+    model = models.MolnixTagGroup
+    list_display = ['name', 'molnix_id']
+    ordering = ('molnix_id',)
+    search_fields = ('name',)
+
+
 @admin.register(models.ERU)
 class ERUAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('national_society_country__name',)
@@ -315,3 +322,4 @@ class EmergencyProjectAdmin(CompareVersionAdmin, admin.ModelAdmin):
 admin.site.register(models.ERUReadiness, ERUReadinessAdmin)
 admin.site.register(models.Sector, SectorAdmin)
 admin.site.register(models.SectorTag, SectorTagAdmin)
+admin.site.register(models.MolnixTagGroup, MolnixTagGroupAdmin)

deployments/serializers.py

@@ -29,6 +29,7 @@
     ERU,
     PersonnelDeployment,
     MolnixTag,
+    MolnixTagGroup,
     Personnel,
     PartnerSocietyActivities,
     PartnerSocietyDeployment,
@@ -117,11 +118,18 @@ class Meta:
 
 
 class MolnixTagSerializer(ModelSerializer):
+    groups = serializers.SerializerMethodField()
 
     class Meta:
-        fields = ('id', 'molnix_id', 'name', 'description', 'color', 'tag_type')
+        fields = ('id', 'molnix_id', 'name', 'description', 'color', 'tag_type', 'groups')
         model = MolnixTag
 
+    @staticmethod
+    def get_groups(obj):
+        return [t.name for t in obj.groups.all() if not t.is_deprecated]
+        # or a detailed response, if needed:
+        # return [{"molnix_id": t.molnix_id, "name": t.name} for t in obj.groups.all() if not t.is_deprecated]
+
 
 class PersonnelDeploymentCsvSerializer(ModelSerializer):
     event_deployed_to = SmallEventForPersonnelCsvSerializer()