Skip to content

Commit 773c07c

Browse files
committed
Datagroup removed as part of the cleanup
1 parent 4160992 commit 773c07c

9 files changed

Lines changed: 19 additions & 47 deletions

File tree

src/apps/api/serializers/datasets.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from rest_framework.exceptions import ValidationError
33

44
from api.mixins import DefaultUserCreateMixin
5-
from datasets.models import Data, DataGroup
5+
from datasets.models import Data
66
from competitions.models import CompetitionCreationTaskStatus, CompetitionDump
77

88

@@ -222,14 +222,3 @@ def get_competition(self, obj):
222222

223223
def get_owner_display_name(self, instance):
224224
return instance.created_by.display_name if instance.created_by.display_name else instance.created_by.username
225-
226-
227-
class DataGroupSerializer(serializers.ModelSerializer):
228-
class Meta:
229-
model = DataGroup
230-
fields = (
231-
'created_by',
232-
'created_when',
233-
'name',
234-
'datas',
235-
)

src/apps/api/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
router.register('phases', competitions.PhaseViewSet, 'phases')
2626
router.register('submissions', submissions.SubmissionViewSet)
2727
router.register('datasets', datasets.DataViewSet)
28-
router.register('data_groups', datasets.DataGroupViewSet)
2928
router.register('leaderboards', leaderboards.LeaderboardViewSet)
3029
router.register('submission_scores', leaderboards.SubmissionScoreViewSet, 'submission_scores')
3130
router.register('tasks', tasks.TaskViewSet)

src/apps/api/views/datasets.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from api.pagination import BasicPagination, LargePagination
1515
from api.serializers import datasets as serializers
16-
from datasets.models import Data, DataGroup
16+
from datasets.models import Data
1717
from competitions.models import CompetitionCreationTaskStatus
1818
from utils.data import make_url_sassy, pretty_bytes, gb_to_bytes
1919

@@ -255,12 +255,6 @@ def public(self, request):
255255
return Response(serializer.data)
256256

257257

258-
class DataGroupViewSet(ModelViewSet):
259-
queryset = DataGroup.objects.all()
260-
serializer_class = serializers.DataGroupSerializer
261-
# TODO: Anyone can delete these?
262-
263-
264258
@api_view(['PUT'])
265259
def upload_completed(request, key):
266260
# TODO: This view is weird. We have competitions, submissions, etc. that may not need to call this?

src/apps/datasets/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44

55

66
admin.site.register(models.Data)
7-
admin.site.register(models.DataGroup)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Generated by Django 3.2 on 2025-10-14 09:38
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('datasets', '0011_auto_20250724_1050'),
10+
]
11+
12+
operations = [
13+
migrations.DeleteModel(
14+
name='DataGroup',
15+
),
16+
]

src/apps/datasets/models.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,3 @@ def get_chahub_data(self):
142142
'is_public': self.is_public,
143143
'download_url': f'http{"s" if ssl else ""}://{site}{self.get_download_url()}'
144144
})
145-
146-
147-
class DataGroup(models.Model):
148-
created_by = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
149-
created_when = models.DateTimeField(default=now)
150-
name = models.CharField(max_length=255)
151-
datas = models.ManyToManyField(Data, related_name="groups")

src/apps/profiles/views.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from oidc_configurations.models import Auth_Organization
2525
from .tokens import account_activation_token, account_deletion_token
2626
from competitions.models import Competition
27-
from datasets.models import Data, DataGroup
27+
from datasets.models import Data
2828
from tasks.models import Task
2929
from forums.models import Post
3030
from utils.email import codalab_send_mail
@@ -136,7 +136,6 @@ def send_user_deletion_notice_to_admin(user):
136136
competitions_participation = Competition.objects.filter(participants__user=user)
137137
submissions = user.submission.all()
138138
data = Data.objects.filter(created_by=user)
139-
data_groups = DataGroup.objects.filter(created_by=user)
140139
tasks = Task.objects.filter(created_by=user)
141140
queues = user.queues.all()
142141
posts = Post.objects.filter(posted_by=user)
@@ -150,7 +149,6 @@ def send_user_deletion_notice_to_admin(user):
150149
'competitions_participation': competitions_participation,
151150
'submissions': submissions,
152151
'data': data,
153-
'data_groups': data_groups,
154152
'tasks': tasks,
155153
'queues': queues,
156154
'posts': posts,

src/templates/profiles/emails/template_delete_account_notice.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ <h3>Summary</h3>
2424
<li>Competitions participation: {{ competitions_participation|length }}</li>
2525
<li>Submissions: {{ submissions|length }}</li>
2626
<li>Data: {{ data|length }}</li>
27-
<li>DataGroups: {{ data_groups|length }}</li>
2827
<li>Tasks: {{ tasks|length }}</li>
2928
<li>Queues: {{ queues|length }}</li>
3029
<li>Posts: {{ posts|length }}</li>
@@ -83,13 +82,6 @@ <h4>Data created by the user</h4>
8382
{% endfor %}
8483
</ul>
8584

86-
<h4>DataGroups created by the user</h4>
87-
<ul>
88-
{% for data_group in data_groups.all %}
89-
<li>{{ data_group }}</li>
90-
{% endfor %}
91-
</ul>
92-
9385
<h4>Tasks created by the user</h4>
9486
<ul>
9587
{% for task in tasks.all %}

src/templates/profiles/emails/template_delete_account_notice.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<li>Competitions participation: {{ competitions_participation|length }}</li>
2525
<li>Submissions: {{ submissions|length }}</li>
2626
<li>Data: {{ data|length }}</li>
27-
<li>DataGroups: {{ data_groups|length }}</li>
2827
<li>Tasks: {{ tasks|length }}</li>
2928
<li>Queues: {{ queues|length }}</li>
3029
<li>Posts: {{ posts|length }}</li>
@@ -83,13 +82,6 @@
8382
{% endfor %}
8483
</ul>
8584

86-
<h4>DataGroups created by the user</h4>
87-
<ul>
88-
{% for data_group in data_groups.all %}
89-
<li>{{ data_group }}</li>
90-
{% endfor %}
91-
</ul>
92-
9385
<h4>Tasks created by the user</h4>
9486
<ul>
9587
{% for task in tasks.all %}

0 commit comments

Comments
 (0)