From 773c07c6a1ed9ab5db8ebeeafe733f82799435ad Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Tue, 14 Oct 2025 14:43:49 +0500 Subject: [PATCH 1/5] Datagroup removed as part of the cleanup --- src/apps/api/serializers/datasets.py | 13 +------------ src/apps/api/urls.py | 1 - src/apps/api/views/datasets.py | 8 +------- src/apps/datasets/admin.py | 1 - .../datasets/migrations/0012_delete_datagroup.py | 16 ++++++++++++++++ src/apps/datasets/models.py | 7 ------- src/apps/profiles/views.py | 4 +--- .../emails/template_delete_account_notice.html | 8 -------- .../emails/template_delete_account_notice.txt | 8 -------- 9 files changed, 19 insertions(+), 47 deletions(-) create mode 100644 src/apps/datasets/migrations/0012_delete_datagroup.py diff --git a/src/apps/api/serializers/datasets.py b/src/apps/api/serializers/datasets.py index f3f9eee76..de9a946d7 100644 --- a/src/apps/api/serializers/datasets.py +++ b/src/apps/api/serializers/datasets.py @@ -2,7 +2,7 @@ from rest_framework.exceptions import ValidationError from api.mixins import DefaultUserCreateMixin -from datasets.models import Data, DataGroup +from datasets.models import Data from competitions.models import CompetitionCreationTaskStatus, CompetitionDump @@ -222,14 +222,3 @@ def get_competition(self, obj): def get_owner_display_name(self, instance): return instance.created_by.display_name if instance.created_by.display_name else instance.created_by.username - - -class DataGroupSerializer(serializers.ModelSerializer): - class Meta: - model = DataGroup - fields = ( - 'created_by', - 'created_when', - 'name', - 'datas', - ) diff --git a/src/apps/api/urls.py b/src/apps/api/urls.py index d0195fbc1..3256ef552 100644 --- a/src/apps/api/urls.py +++ b/src/apps/api/urls.py @@ -25,7 +25,6 @@ router.register('phases', competitions.PhaseViewSet, 'phases') router.register('submissions', submissions.SubmissionViewSet) router.register('datasets', datasets.DataViewSet) -router.register('data_groups', datasets.DataGroupViewSet) router.register('leaderboards', leaderboards.LeaderboardViewSet) router.register('submission_scores', leaderboards.SubmissionScoreViewSet, 'submission_scores') router.register('tasks', tasks.TaskViewSet) diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py index 6ceec39eb..ae17dda07 100644 --- a/src/apps/api/views/datasets.py +++ b/src/apps/api/views/datasets.py @@ -13,7 +13,7 @@ from api.pagination import BasicPagination, LargePagination from api.serializers import datasets as serializers -from datasets.models import Data, DataGroup +from datasets.models import Data from competitions.models import CompetitionCreationTaskStatus from utils.data import make_url_sassy, pretty_bytes, gb_to_bytes @@ -255,12 +255,6 @@ def public(self, request): return Response(serializer.data) -class DataGroupViewSet(ModelViewSet): - queryset = DataGroup.objects.all() - serializer_class = serializers.DataGroupSerializer - # TODO: Anyone can delete these? - - @api_view(['PUT']) def upload_completed(request, key): # TODO: This view is weird. We have competitions, submissions, etc. that may not need to call this? diff --git a/src/apps/datasets/admin.py b/src/apps/datasets/admin.py index 7c2d1c1e5..2fc94340d 100644 --- a/src/apps/datasets/admin.py +++ b/src/apps/datasets/admin.py @@ -4,4 +4,3 @@ admin.site.register(models.Data) -admin.site.register(models.DataGroup) diff --git a/src/apps/datasets/migrations/0012_delete_datagroup.py b/src/apps/datasets/migrations/0012_delete_datagroup.py new file mode 100644 index 000000000..2b214c19a --- /dev/null +++ b/src/apps/datasets/migrations/0012_delete_datagroup.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2 on 2025-10-14 09:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('datasets', '0011_auto_20250724_1050'), + ] + + operations = [ + migrations.DeleteModel( + name='DataGroup', + ), + ] diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py index 2fb6da605..633ec5ac5 100644 --- a/src/apps/datasets/models.py +++ b/src/apps/datasets/models.py @@ -142,10 +142,3 @@ def get_chahub_data(self): 'is_public': self.is_public, 'download_url': f'http{"s" if ssl else ""}://{site}{self.get_download_url()}' }) - - -class DataGroup(models.Model): - created_by = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) - created_when = models.DateTimeField(default=now) - name = models.CharField(max_length=255) - datas = models.ManyToManyField(Data, related_name="groups") diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py index 8868c154a..46bb76f56 100644 --- a/src/apps/profiles/views.py +++ b/src/apps/profiles/views.py @@ -24,7 +24,7 @@ from oidc_configurations.models import Auth_Organization from .tokens import account_activation_token, account_deletion_token from competitions.models import Competition -from datasets.models import Data, DataGroup +from datasets.models import Data from tasks.models import Task from forums.models import Post from utils.email import codalab_send_mail @@ -136,7 +136,6 @@ def send_user_deletion_notice_to_admin(user): competitions_participation = Competition.objects.filter(participants__user=user) submissions = user.submission.all() data = Data.objects.filter(created_by=user) - data_groups = DataGroup.objects.filter(created_by=user) tasks = Task.objects.filter(created_by=user) queues = user.queues.all() posts = Post.objects.filter(posted_by=user) @@ -150,7 +149,6 @@ def send_user_deletion_notice_to_admin(user): 'competitions_participation': competitions_participation, 'submissions': submissions, 'data': data, - 'data_groups': data_groups, 'tasks': tasks, 'queues': queues, 'posts': posts, diff --git a/src/templates/profiles/emails/template_delete_account_notice.html b/src/templates/profiles/emails/template_delete_account_notice.html index e71db8ac4..fe0dc9e9f 100644 --- a/src/templates/profiles/emails/template_delete_account_notice.html +++ b/src/templates/profiles/emails/template_delete_account_notice.html @@ -24,7 +24,6 @@

Summary

  • Competitions participation: {{ competitions_participation|length }}
  • Submissions: {{ submissions|length }}
  • Data: {{ data|length }}
    • -
  • DataGroups: {{ data_groups|length }}
  • Tasks: {{ tasks|length }}
  • Queues: {{ queues|length }}
  • Posts: {{ posts|length }}
    • @@ -83,13 +82,6 @@

    Data created by the user

    {% endfor %} -

    DataGroups created by the user

    - -

    Tasks created by the user

    -

    DataGroups created by the user

    - -

    Tasks created by the user